run credo on PR

.gitattributes

@@ -1,4 +1,11 @@
 *.ex diff=elixir
 *.exs diff=elixir
 
-*.css diff=css
+# Most of js/css files included in the repo are minified bundles,
+#   and we don't want to search/diff those as text files.
+*.js binary
+*.js.map binary
+*.css binary
+
+priv/static/instance/static.css diff=css
+priv/static/static-fe/static-fe.css diff=css

.gitignore

@@ -76,4 +76,3 @@ docs/site
 
 # docker stuff
 docker-db
-*.iml

.woodpecker.yml

@@ -74,6 +74,14 @@ pipeline:
       - mix deps.get
       - mix compile
 
+  credo:
+    <<: *on-pr-open
+    image: akkoma/ci-base:1.14
+    commands:
+    - mix local.hex --force
+    - mix local.rebar --force
+    - mix credo || true # we don't want to error here
+
   test:
     image: akkoma/ci-base:1.14
     <<: *on-pr-open

CHANGELOG.md

@@ -6,38 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
-### Added
-- Prometheus metrics exporting from `/api/v1/akkoma/metrics`
-- Ability to alter http pool size
-- Translation of statuses via ArgosTranslate
-- Argon2 password hashing
-- Ability to "verify" links in profile fields via rel=me
-- Mix tasks to dump/load config to/from json for bulk editing
-- Followed hashtag list at /api/v1/followed\_tags, API parity with mastodon
-
 ### Removed
 - Non-finch HTTP adapters
 - Legacy redirect from /api/pleroma/admin to /api/v1/pleroma/admin
-- Legacy redirects from /api/pleroma to /api/v1/pleroma
-- :crypt dependency
 
 ### Changed
 - Return HTTP error 413 when uploading an avatar or banner that's above the configured upload limit instead of a 500.
-- Non-admin users now cannot register `admin` scope tokens (not security-critical, they didn't work before, but you _could_ create them)
-  - Admin scopes will be dropped on create
-- Rich media will now backoff for 20 minutes after a failure
-- Quote posts are now considered as part of the same thread as the post they are quoting
-- Simplified HTTP signature processing
-- Rich media will now hard-exit after 5 seconds, to prevent timeline hangs
-- HTTP Content Security Policy is now far more strict to prevent any potential XSS/CSS leakages
-
-### Fixed 
-- /api/v1/accounts/lookup will now respect restrict\_unauthenticated
-- Unknown atoms in the config DB will no longer crash akkoma on boot
 
 ### Upgrade notes
 - Ensure `config :tesla, :adapter` is either unset, or set to `{Tesla.Adapter.Finch, name: MyFinch}` in your .exs config
-- Pleroma-FE will need to be updated to handle the new /api/v1/pleroma endpoints for  custom emoji
 
 ## 2022.12
 

config/config.exs

@@ -179,7 +179,6 @@
   receive_timeout: :timer.seconds(15),
   proxy_url: nil,
   user_agent: :default,
-  pool_size: 50,
   adapter: []
 
 config :pleroma, :instance,
@@ -260,8 +259,7 @@
   profile_directory: true,
   privileged_staff: false,
   local_bubble: [],
-  max_frontend_settings_json_chars: 100_000,
+  max_frontend_settings_json_chars: 100_000
-  export_prometheus_metrics: true
 
 config :pleroma, :welcome,
   direct_message: [
@@ -426,7 +424,7 @@
     Pleroma.Web.RichMedia.Parsers.TwitterCard,
     Pleroma.Web.RichMedia.Parsers.OEmbed
   ],
-  failure_backoff: :timer.minutes(20),
+  failure_backoff: 60_000,
   ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]
 
 config :pleroma, :media_proxy,
@@ -783,6 +781,14 @@
         "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/${ref}/admin-fe.zip",
       "ref" => "stable"
     },
+    "soapbox-fe" => %{
+      "name" => "soapbox-fe",
+      "git" => "https://gitlab.com/soapbox-pub/soapbox",
+      "build_url" =>
+        "https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/${ref}/download?job=build-production",
+      "ref" => "v2.0.0",
+      "build_dir" => "static"
+    },
     # For developers - enables a swagger frontend to view the openapi spec
     "swagger-ui" => %{
       "name" => "swagger-ui",
@@ -882,11 +888,6 @@
   url: "http://127.0.0.1:5000",
   api_key: nil
 
-config :pleroma, :argos_translate,
-  command_argos_translate: "argos-translate",
-  command_argospm: "argospm",
-  strip_html: true
-
 # 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"

config/description.exs

@@ -964,11 +964,6 @@
         type: {:list, :string},
         description:
           "List of instances that make up your local bubble (closely-related instances). Used to populate the 'bubble' timeline (domain only)."
-      },
-      %{
-        key: :export_prometheus_metrics,
-        type: :boolean,
-        description: "Enable prometheus metrics (at /api/v1/akkoma/metrics)"
       }
     ]
   },
@@ -2661,12 +2656,6 @@
           "What user agent to use. Must be a string or an atom `:default`. Default value is `:default`.",
         suggestions: ["Pleroma", :default]
       },
-      %{
-        key: :pool_size,
-        type: :integer,
-        description: "Number of concurrent outbound HTTP requests to allow. Default 50.",
-        suggestions: [50]
-      },
       %{
         key: :adapter,
         type: :keyword,
@@ -3442,32 +3431,5 @@
         suggestion: [nil]
       }
     ]
-  },
-  %{
-    group: :pleroma,
-    key: :argos_translate,
-    type: :group,
-    description: "ArgosTranslate Settings.",
-    children: [
-      %{
-        key: :command_argos_translate,
-        type: :string,
-        description:
-          "command for `argos-translate`. Can be the command if it's in your PATH, or the full path to the file.",
-        suggestion: ["argos-translate"]
-      },
-      %{
-        key: :command_argospm,
-        type: :string,
-        description:
-          "command for `argospm`. Can be the command if it's in your PATH, or the full path to the file.",
-        suggestion: ["argospm"]
-      },
-      %{
-        key: :strip_html,
-        type: :boolean,
-        description: "Strip html from the post before translating it."
-      }
-    ]
   }
 ]

docs/docs/administration/CLI_tasks/config.md

@@ -155,51 +155,3 @@ This forcibly removes all saved values in the database.
     ```sh
     mix pleroma.config [--force] reset
     ```
-
-## Dumping specific configuration values to JSON
-
-If you want to bulk-modify configuration values (for example, for MRF modifications),
-it may be easier to dump the values to JSON and then modify them in a text editor.
-
-=== "OTP"
-
-    ```sh
-    ./bin/pleroma_ctl config dump_to_file group key path
-    # For example, to dump the MRF simple configuration:
-    ./bin/pleroma_ctl config dump_to_file pleroma mrf_simple /tmp/mrf_simple.json
-    ```
-
-=== "From Source"
-
-    ```sh
-    mix pleroma.config dump_to_file group key path 
-    # For example, to dump the MRF simple configuration:
-    mix pleroma.config dump_to_file pleroma mrf_simple /tmp/mrf_simple.json
-    ```
-
-## Loading specific configuration values from JSON
-
-**Note:** This will overwrite any existing value in the database, and can
-cause crashes if you do not have exactly the correct formatting.
-
-Once you have modified the JSON file, you can load it back into the database.
-
-=== "OTP"
-
-    ```sh
-    ./bin/pleroma_ctl config load_from_file path
-    # For example, to load the MRF simple configuration:
-    ./bin/pleroma_ctl config load_from_file /tmp/mrf_simple.json
-    ```
-
-=== "From Source"
-
-    ```sh
-    mix pleroma.config load_from_file path
-    # For example, to load the MRF simple configuration:
-    mix pleroma.config load_from_file /tmp/mrf_simple.json
-    ```
-
-**NOTE** an instance reboot is needed for many changes to take effect,
-you may want to visit `/api/v1/pleroma/admin/restart` on your instance
-to soft-restart the instance.

docs/docs/administration/CLI_tasks/frontend.md

@@ -21,23 +21,24 @@ Currently, known `<frontend>` values are:
 - [admin-fe](https://akkoma.dev/AkkomaGang/admin-fe)
 - [mastodon-fe](https://akkoma.dev/AkkomaGang/masto-fe)
 - [pleroma-fe](https://akkoma.dev/AkkomaGang/pleroma-fe)
+- [soapbox-fe](https://gitlab.com/soapbox-pub/soapbox-fe)
 
 You can still install frontends that are not configured, see below.
 
-## Example installations for a known frontend (Stable-Version)
+## Example installations for a known frontend
 
 For a frontend configured under the `available` key, it's enough to install it by name.
 
 === "OTP"
 
     ```sh
-    ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
+    ./bin/pleroma_ctl frontend install pleroma-fe
     ```
 
 === "From Source"
 
     ```sh
-    mix pleroma.frontend install pleroma-fe --ref stable
+    mix pleroma.frontend install pleroma-fe
     ```
 
 This will download the latest build for the pre-configured `ref` and install it. It can then be configured as the one of the served frontends in the config file (see `primary` or `admin`).

docs/docs/administration/CLI_tasks/robots_txt.md

@@ -11,11 +11,11 @@ If you want to generate a restrictive `robots.txt`, you can run the following mi
 === "OTP"
 
     ```sh
-    ./bin/pleroma_ctl robotstxt disallow_all
+    ./bin/pleroma_ctl robots_txt disallow_all
     ```
 
 === "From Source"
 
     ```sh
-    mix pleroma.robotstxt disallow_all
+    mix pleroma.robots_txt disallow_all
     ```

docs/docs/administration/monitoring.md

@@ -1,33 +0,0 @@
-# Monitoring Akkoma
-
-If you run akkoma, you may be inclined to collect metrics to ensure your instance is running smoothly,
-and that there's nothing quietly failing in the background.
-
-To facilitate this, akkoma exposes prometheus metrics to be scraped.
-
-## Prometheus
-
-See: [export\_prometheus\_metrics](../../configuration/cheatsheet#instance)
-
-To scrape prometheus metrics, we need an oauth2 token with the `admin:metrics` scope.
-
-consider using [constanze](https://akkoma.dev/AkkomaGang/constanze) to make this easier -
-
-```bash
-constanze token --client-app --scopes "admin:metrics" --client-name "Prometheus"
-```
-
-or see `scripts/create_metrics_app.sh` in the source tree for the process to get this token.
-
-Once you have your token of the form `Bearer $ACCESS_TOKEN`, you can use that in your prometheus config:
-
-```yaml
-- job_name: akkoma
-  scheme: https
-  authorization:
-    credentials: $ACCESS_TOKEN # this should have the bearer prefix removed
-  metrics_path: /api/v1/akkoma/metrics
-  static_configs:
-  - targets:
-    - example.com
-```

docs/docs/administration/updating.md

@@ -1,6 +1,6 @@
 # Updating your instance
 
-You should **always check the [release notes/changelog](https://akkoma.dev/AkkomaGang/akkoma/src/branch/stable/CHANGELOG.md)** in case there are config deprecations, special update steps, etc.
+You should **always check the [release notes/changelog](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/CHANGELOG.md)** in case there are config deprecations, special update steps, etc.
 
 Besides that, doing the following is generally enough:
 ## Switch to the akkoma user
@@ -41,10 +41,8 @@ you _may_ need to specify `--flavour`, in the same way as
 Run as the `akkoma` user:
 
 ```sh
-# fetch changes
+# Pull in new changes
-git fetch
+git pull
-# check out the latest tag
-git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
 
 # Run with production configuration
 export MIX_ENV=prod
@@ -59,7 +57,7 @@ sudo systemctl stop akkoma
 # Run database migrations
 mix ecto.migrate
 
-# Update Pleroma-FE frontend to latest stable. For other Frontends see Frontend Configration doc for more information.
+# Update frontend(s). See Frontend Configration doc for more information.
 mix pleroma.frontend install pleroma-fe --ref stable
 
 # Start akkoma (replace with your system service manager's equivalent if different)

docs/docs/configuration/cheatsheet.md

@@ -62,7 +62,6 @@ To add configuration to your config file, you can copy it from the base config.
 * `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
 * `local_bubble`: Array of domains representing instances closely related to yours. Used to populate the `bubble` timeline. e.g `["example.com"]`, (default: `[]`)
 * `languages`: List of Language Codes used by the instance. This is used to try and set a default language from the frontend. It will try and find the first match between the languages set here and the user's browser languages. It will default to the first language in this setting if there is no match.. (default `["en"]`)
-* `export_prometheus_metrics`: Enable prometheus metrics, served at `/api/v1/akkoma/metrics`, requiring the `admin:metrics` oauth scope.
 
 ## :database
 * `improved_hashtag_timeline`: Setting to force toggle / force disable improved hashtags timeline. `:enabled` forces hashtags to be fetched from `hashtags` table for hashtags timeline. `:disabled` forces object-embedded hashtags to be used (slower). Keep it `:auto` for automatic behaviour (it is auto-set to `:enabled` [unless overridden] when HashtagsTableMigrator completes).
@@ -1119,7 +1118,7 @@ Each job has these settings:
 ### Translation Settings
 
 Settings to automatically translate statuses for end users. Currently supported
-translation services are DeepL and LibreTranslate. The supported command line tool is [Argos Translate](https://github.com/argosopentech/argos-translate).
+translation services are DeepL and LibreTranslate.
 
 Translations are available at `/api/v1/statuses/:id/translations/:language`, where
 `language` is the target language code (e.g `en`)
@@ -1128,7 +1127,7 @@ Translations are available at `/api/v1/statuses/:id/translations/:language`, whe
 
 - `:enabled` - enables translation
 - `:module` - Sets module to be used
-  - Either `Pleroma.Akkoma.Translators.DeepL`, `Pleroma.Akkoma.Translators.LibreTranslate`, or `Pleroma.Akkoma.Translators.ArgosTranslate`
+  - Either `Pleroma.Akkoma.Translators.DeepL` or `Pleroma.Akkoma.Translators.LibreTranslate`
 
 ### `:deepl`
 
@@ -1140,9 +1139,3 @@ Translations are available at `/api/v1/statuses/:id/translations/:language`, whe
 
 - `:url` - URL of LibreTranslate instance
 - `:api_key` - API key for LibreTranslate
-
-### `:argos_translate`
-
-- `:command_argos_translate` - command for `argos-translate`. Can be the command if it's in your PATH, or the full path to the file  (default: `argos-translate`).
-- `:command_argospm` - command for `argospm`. Can be the command if it's in your PATH, or the full path to the file (default: `argospm`).
-- `:strip_html` - Strip html from the post before translating it (default: `true`).

docs/docs/configuration/custom_emoji.md

@@ -67,29 +67,3 @@ Priority of tags assigns in emoji.txt and custom.txt:
 Priority for globs:
 
 `special group setting in config.exs > default setting in config.exs`
-
-## Stealing emoji
-
-Managing your emoji can be hard work, and you just want to have the cool emoji your friends use? As usual, crime comes to the rescue!
-
-You can use the `Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy` [Message Rewrite Facility](../configuration/cheatsheet.md#mrf) to automatically add to your instance emoji that messages from specific servers contain. Note that this happens on message processing, so the emoji will be added only after your instance receives some interaction containing emoji _after_ configuring this.
-
-To activate this you have to [configure](../configuration/cheatsheet.md#mrf_steal_emoji) it in your configuration file. For example if you wanted to steal any emoji that is not related to cinnamon and not larger than about 10K from `coolemoji.space` and `spiceenthusiasts.biz`, you would add the following:
-```elixir
-config :pleroma, :mrf,
-  policies: [
-    Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy
-  ]
-
-config :pleroma, :mrf_steal_emoji,
-  hosts: [
-    "coolemoji.space",
-    "spiceenthusiasts.biz"
-  ],
-  rejected_shortcodes: [
-    ".*cinnamon.*"
-  ],
-  size_limit: 10000
-```
-
-Note that this may not obey emoji licensing restrictions. It's extremely unlikely that anyone will care, but keep this in mind for when Nintendo starts their own instance.

docs/docs/installation/alpine_linux_en.md

@@ -84,12 +84,12 @@ doas adduser -S -s /bin/false -h /opt/akkoma -H -G akkoma akkoma
 
 **Note**: To execute a single command as the Akkoma system user, use `doas -u akkoma command`. You can also switch to a shell by using `doas -su akkoma`. If you don’t have and want `doas` on your system, you can use `su` as root user (UID 0) for a single command by using `su -l akkoma -s $SHELL -c 'command'` and `su -l akkoma -s $SHELL` for starting a shell.
 
-* Git clone the AkkomaBE repository from stable-branch and make the Akkoma user the owner of the directory:
+* Git clone the AkkomaBE repository and make the Akkoma user the owner of the directory:
 
 ```shell
 doas mkdir -p /opt/akkoma
 doas chown -R akkoma:akkoma /opt/akkoma
-doas -u akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable /opt/akkoma
+doas -u akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
 ```
 
 * Change to the new directory:
@@ -109,7 +109,7 @@ doas -u akkoma mix deps.get
   * This may take some time, because parts of akkoma get compiled first.
   * After that it will ask you a few questions about your instance and generates a configuration file in `config/generated_config.exs`.
 
-* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instances):
+* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instance, `dev.secret.exs` for development instances):
 
 ```shell
 doas -u akkoma mv config/{generated_config.exs,prod.secret.exs}

docs/docs/installation/arch_linux_en.md

@@ -75,12 +75,12 @@ sudo useradd -r -s /bin/false -m -d /var/lib/akkoma -U akkoma
 
 **Note**: To execute a single command as the Akkoma system user, use `sudo -Hu akkoma command`. You can also switch to a shell by using `sudo -Hu akkoma $SHELL`. If you don’t have and want `sudo` on your system, you can use `su` as root user (UID 0) for a single command by using `su -l akkoma -s $SHELL -c 'command'` and `su -l akkoma -s $SHELL` for starting a shell.
 
-* Git clone the AkkomaBE repository from stable-branch and make the Akkoma user the owner of the directory:
+* Git clone the AkkomaBE repository and make the Akkoma user the owner of the directory:
 
 ```shell
 sudo mkdir -p /opt/akkoma
 sudo chown -R akkoma:akkoma /opt/akkoma
-sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable /opt/akkoma
+sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
 ```
 
 * Change to the new directory:
@@ -100,7 +100,7 @@ sudo -Hu akkoma mix deps.get
   * This may take some time, because parts of akkoma get compiled first.
   * After that it will ask you a few questions about your instance and generates a configuration file in `config/generated_config.exs`.
 
-* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instances):
+* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instance, `dev.secret.exs` for development instances):
 
 ```shell
 sudo -Hu akkoma mv config/{generated_config.exs,prod.secret.exs}

docs/docs/installation/debian_based_en.md

@@ -49,12 +49,12 @@ sudo useradd -r -s /bin/false -m -d /var/lib/akkoma -U akkoma
 
 **Note**: To execute a single command as the Akkoma system user, use `sudo -Hu akkoma command`. You can also switch to a shell by using `sudo -Hu akkoma $SHELL`. If you don’t have and want `sudo` on your system, you can use `su` as root user (UID 0) for a single command by using `su -l akkoma -s $SHELL -c 'command'` and `su -l akkoma -s $SHELL` for starting a shell.
 
-* Git clone the AkkomaBE repository from stable-branch and make the Akkoma user the owner of the directory:
+* Git clone the AkkomaBE repository and make the Akkoma user the owner of the directory:
 
 ```shell
 sudo mkdir -p /opt/akkoma
 sudo chown -R akkoma:akkoma /opt/akkoma
-sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable /opt/akkoma
+sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
 ```
 
 * Change to the new directory:
@@ -74,7 +74,7 @@ sudo -Hu akkoma mix deps.get
   * This may take some time, because parts of akkoma get compiled first.
   * After that it will ask you a few questions about your instance and generates a configuration file in `config/generated_config.exs`.
 
-* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instances):
+* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instance, `dev.secret.exs` for development instances):
 
 ```shell
 sudo -Hu akkoma mv config/{generated_config.exs,prod.secret.exs}

docs/docs/installation/fedora_based_en.md

@@ -30,10 +30,11 @@ sudo dnf install git gcc g++ make cmake file-devel postgresql-server postgresql-
 
 * Enable and initialize Postgres:
 ```shell
+sudo systemctl enable postgresql.service
 sudo postgresql-setup --initdb --unit postgresql
 # Allow password auth for postgres
 sudo sed -E -i 's|(host +all +all +127.0.0.1/32 +)ident|\1md5|' /var/lib/pgsql/data/pg_hba.conf
-sudo systemctl enable --now postgresql.service
+sudo systemctl start postgresql.service
 ```
 
 ### Install Elixir and Erlang
@@ -58,7 +59,7 @@ sudo dnf install ffmpeg
 * Install ImageMagick and ExifTool for image manipulation:
 
 ```shell
-sudo dnf install ImageMagick perl-Image-ExifTool
+sudo dnf install Imagemagick perl-Image-ExifTool
 ```
 
 
@@ -73,12 +74,12 @@ sudo useradd -r -s /bin/false -m -d /var/lib/akkoma -U akkoma
 
 **Note**: To execute a single command as the Akkoma system user, use `sudo -Hu akkoma command`. You can also switch to a shell by using `sudo -Hu akkoma $SHELL`. If you don’t have and want `sudo` on your system, you can use `su` as root user (UID 0) for a single command by using `su -l akkoma -s $SHELL -c 'command'` and `su -l akkoma -s $SHELL` for starting a shell.
 
-* Git clone the AkkomaBE repository from stable-branch and make the Akkoma user the owner of the directory:
+* Git clone the AkkomaBE repository and make the Akkoma user the owner of the directory:
 
 ```shell
 sudo mkdir -p /opt/akkoma
 sudo chown -R akkoma:akkoma /opt/akkoma
-sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable /opt/akkoma
+sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
 ```
 
 * Change to the new directory:
@@ -98,7 +99,7 @@ sudo -Hu akkoma mix deps.get
   * This may take some time, because parts of akkoma get compiled first.
   * After that it will ask you a few questions about your instance and generates a configuration file in `config/generated_config.exs`.
 
-* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instances):
+* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instance, `dev.secret.exs` for development instances):
 
 ```shell
 sudo -Hu akkoma mv config/{generated_config.exs,prod.secret.exs}

docs/docs/installation/otp_en.md

@@ -118,8 +118,8 @@ Restart PostgreSQL to apply configuration changes:
 adduser --system --shell  /bin/false --home /opt/akkoma akkoma
 
 # Set the flavour environment variable to the string you got in Detecting flavour section.
-# For example if the flavour is `amd64` the command will be
+# For example if the flavour is `amd64-musl` the command will be
-export FLAVOUR="amd64"
+export FLAVOUR="amd64-musl"
 
 # Clone the release build into a temporary directory and unpack it
 su akkoma -s $SHELL -lc "

docs/docs/installation/otp_redhat_en.md

@@ -37,7 +37,7 @@ sudo dnf install git gcc g++ erlang elixir erlang-os_mon erlang-eldap erlang-xme
 
 ```shell
 cd ~
-git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable
+git clone https://akkoma.dev/AkkomaGang/akkoma.git
 ```
 
 * Change to the new directory:

docs/docs/installation/verifying_otp_releases.md

@@ -12,7 +12,7 @@ Release URLs will always be of the form
 https://akkoma-updates.s3-website.fr-par.scw.cloud/{branch}/akkoma-{flavour}.zip
 ```
 
-Where branch is usually `stable` and `flavour` is
+Where branch is usually `stable` or `develop`, and `flavour` is
 the one [that you detect on install](../otp_en/#detecting-flavour).
 
 So, for an AMD64 stable install, your update URL will be

installation/nginx/akkoma.nginx

@@ -54,6 +54,8 @@ server {
     ssl_protocols TLSv1.2 TLSv1.3;
     ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
     ssl_prefer_server_ciphers off;
+    # In case of an old server with an OpenSSL version of 1.0.2 or below,
+    # leave only prime256v1 or comment out the following line.
     ssl_ecdh_curve X25519:prime256v1:secp384r1:secp521r1;
     ssl_stapling on;
     ssl_stapling_verify on;

lib/mix/tasks/pleroma/config.ex

@@ -79,45 +79,6 @@ def run(["dump", group]) do
     end)
   end
 
-  def run(["dump_to_file", group, key, fname]) do
-    check_configdb(fn ->
-      start_pleroma()
-
-      group = maybe_atomize(group)
-      key = maybe_atomize(key)
-
-      config = ConfigDB.get_by_group_and_key(group, key)
-
-      json =
-        %{
-          group: ConfigDB.to_json_types(config.group),
-          key: ConfigDB.to_json_types(config.key),
-          value: ConfigDB.to_json_types(config.value)
-        }
-        |> Jason.encode!()
-        |> Jason.Formatter.pretty_print()
-
-      File.write(fname, json)
-      shell_info("Wrote #{group}_#{key}.json")
-    end)
-  end
-
-  def run(["load_from_file", fname]) do
-    check_configdb(fn ->
-      start_pleroma()
-
-      json = File.read!(fname)
-      config = Jason.decode!(json)
-      group = ConfigDB.to_elixir_types(config["group"])
-      key = ConfigDB.to_elixir_types(config["key"])
-      value = ConfigDB.to_elixir_types(config["value"])
-      params = %{group: group, key: key, value: value}
-
-      ConfigDB.update_or_create(params)
-      shell_info("Loaded #{config["group"]}, #{config["key"]}")
-    end)
-  end
-
   def run(["groups"]) do
     check_configdb(fn ->
       start_pleroma()

lib/pleroma/akkoma/translators/argos_translate.ex

@@ -1,109 +0,0 @@
-defmodule Pleroma.Akkoma.Translators.ArgosTranslate do
-  @behaviour Pleroma.Akkoma.Translator
-
-  alias Pleroma.Config
-
-  defp argos_translate do
-    Config.get([:argos_translate, :command_argos_translate])
-  end
-
-  defp argospm do
-    Config.get([:argos_translate, :command_argospm])
-  end
-
-  defp strip_html? do
-    Config.get([:argos_translate, :strip_html])
-  end
-
-  defp safe_languages() do
-    try do
-      System.cmd(argospm(), ["list"], stderr_to_stdout: true, parallelism: true)
-    rescue
-      _ -> {"Command #{argospm()} not found", 1}
-    end
-  end
-
-  @impl Pleroma.Akkoma.Translator
-  def languages do
-    with {response, 0} <- safe_languages() do
-      langs =
-        response
-        |> String.split("\n", trim: true)
-        |> Enum.map(fn
-          "translate-" <> l -> String.split(l, "_")
-        end)
-
-      source_langs =
-        langs
-        |> Enum.map(fn [l, _] -> %{code: l, name: l} end)
-        |> Enum.uniq()
-
-      dest_langs =
-        langs
-        |> Enum.map(fn [_, l] -> %{code: l, name: l} end)
-        |> Enum.uniq()
-
-      {:ok, source_langs, dest_langs}
-    else
-      {response, _} -> {:error, "ArgosTranslate failed to fetch languages (#{response})"}
-    end
-  end
-
-  defp safe_translate(string, from_language, to_language) do
-    try do
-      System.cmd(
-        argos_translate(),
-        ["--from-lang", from_language, "--to-lang", to_language, string],
-        stderr_to_stdout: true,
-        parallelism: true
-      )
-    rescue
-      _ -> {"Command #{argos_translate()} not found", 1}
-    end
-  end
-
-  defp clean_string(string, true) do
-    string
-    |> String.replace("<p>", "\n")
-    |> String.replace("</p>", "\n")
-    |> String.replace("<br>", "\n")
-    |> String.replace("<br/>", "\n")
-    |> String.replace("<li>", "\n")
-    |> Pleroma.HTML.strip_tags()
-    |> HtmlEntities.decode()
-  end
-
-  defp clean_string(string, _), do: string
-
-  defp htmlify_response(string, true) do
-    string
-    |> HtmlEntities.encode()
-    |> String.replace("\n", "<br/>")
-  end
-
-  defp htmlify_response(string, _), do: string
-
-  @impl Pleroma.Akkoma.Translator
-  def translate(string, nil, to_language) do
-    # Akkoma's Pleroma-fe expects us to detect the source language automatically.
-    # Argos-translate doesn't have that option (yet?)
-    #     see <https://github.com/argosopentech/argos-translate/issues/9>
-    # For now we return the text unchanged, supposedly translated from the target language.
-    # Afterwards people get the option to overwrite the source language from a dropdown.
-    {:ok, to_language, string}
-  end
-
-  def translate(string, from_language, to_language) do
-    # Argos Translate doesn't properly translate HTML (yet?)
-    # For now we give admins the option to strip the html before translating
-    # Note that we have to add some html back to the response afterwards
-    string = clean_string(string, strip_html?())
-
-    with {translated, 0} <-
-           safe_translate(string, from_language, to_language) do
-      {:ok, from_language, translated |> htmlify_response(strip_html?())}
-    else
-      {response, _} -> {:error, "ArgosTranslate failed to translate (#{response})"}
-    end
-  end
-end

lib/pleroma/application.ex

@@ -73,8 +73,7 @@ def start(_type, _args) do
           Pleroma.JobQueueMonitor,
           {Majic.Pool, [name: Pleroma.MajicPool, pool_size: Config.get([:majic_pool, :size], 2)]},
           {Oban, Config.get(Oban)},
-          Pleroma.Web.Endpoint,
+          Pleroma.Web.Endpoint
-          Pleroma.Web.Telemetry
         ] ++
         elasticsearch_children() ++
         task_children(@mix_env) ++
@@ -159,8 +158,7 @@ defp cachex_children do
       build_cachex("banned_urls", default_ttl: :timer.hours(24 * 30), limit: 5_000),
       build_cachex("translations", default_ttl: :timer.hours(24 * 30), limit: 2500),
       build_cachex("instances", default_ttl: :timer.hours(24), ttl_interval: 1000, limit: 2500),
-      build_cachex("request_signatures", default_ttl: :timer.hours(24 * 30), limit: 3000),
+      build_cachex("request_signatures", default_ttl: :timer.hours(24 * 30), limit: 3000)
-      build_cachex("rel_me", default_ttl: :timer.hours(24 * 30), limit: 300)
     ]
   end
 
@@ -260,12 +258,10 @@ def limiters_setup do
   defp http_children do
     proxy_url = Config.get([:http, :proxy_url])
     proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
-    pool_size = Config.get([:http, :pool_size])
 
     config =
       [:http, :adapter]
       |> Config.get([])
-      |> Pleroma.HTTP.AdapterHelper.add_pool_size(pool_size)
       |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy_pool(proxy)
       |> Keyword.put(:name, MyFinch)
 

lib/pleroma/config/transfer_task.ex

@@ -25,9 +25,7 @@ defp reboot_time_subkeys,
     do: [
       {:pleroma, Pleroma.Captcha, [:seconds_valid]},
       {:pleroma, Pleroma.Upload, [:proxy_remote]},
-      {:pleroma, :instance, [:upload_limit]},
+      {:pleroma, :instance, [:upload_limit]}
-      {:pleroma, :http, [:pool_size]},
-      {:pleroma, :http, [:proxy_url]}
     ]
 
   def start_link(restart_pleroma? \\ true) do
@@ -42,7 +40,6 @@ def load_and_update_env(deleted_settings \\ [], restart_pleroma? \\ true) do
       # We need to restart applications for loaded settings take effect
       {logger, other} =
         (Repo.all(ConfigDB) ++ deleted_settings)
-        |> Enum.reject(&invalid_key_or_group/1)
         |> Enum.map(&merge_with_default/1)
         |> Enum.split_with(fn {group, _, _, _} -> group == :logger end)
 
@@ -86,10 +83,6 @@ defp maybe_set_pleroma_last(apps) do
     end
   end
 
-  defp invalid_key_or_group(%ConfigDB{key: :invalid_atom}), do: true
-  defp invalid_key_or_group(%ConfigDB{group: :invalid_atom}), do: true
-  defp invalid_key_or_group(_), do: false
-
   defp merge_with_default(%{group: group, key: key, value: value} = setting) do
     default =
       if group == :pleroma do

lib/pleroma/config_db.ex

@@ -342,11 +342,7 @@ def string_to_elixir_types(":" <> atom), do: String.to_atom(atom)
 
   def string_to_elixir_types(value) do
     if module_name?(value) do
-      try do
+      String.to_existing_atom("Elixir." <> value)
-        String.to_existing_atom("Elixir." <> value)
-      rescue
-        ArgumentError -> :invalid_atom
-      end
     else
       value
     end

lib/pleroma/emails/user_email.ex

@@ -121,7 +121,7 @@ def user_invitation_email(
           "user invitation email body",
           """
           <h3>You are invited to %{instance_name}</h3>
-          <p>%{inviter_name} invites you to join %{instance_name}, an instance of Akkoma federated social networking platform.</p>
+          <p>%{inviter_name} invites you to join %{instance_name}, an instance of Pleroma federated social networking platform.</p>
           <p>Click the following link to register: <a href="%{registration_url}">accept invitation</a>.</p>
           """,
           instance_name: instance_name(),
@@ -357,7 +357,7 @@ def backup_is_ready_email(backup, admin_user_id \\ nil) do
             "static_pages",
             "account archive email body - self-requested",
             """
-            <p>You requested a full backup of your Akkoma account. It's ready for download:</p>
+            <p>You requested a full backup of your Pleroma account. It's ready for download:</p>
             <p><a href="%{download_url}">%{download_url}</a></p>
             """,
             download_url: download_url
@@ -369,7 +369,7 @@ def backup_is_ready_email(backup, admin_user_id \\ nil) do
             "static_pages",
             "account archive email body - admin requested",
             """
-            <p>Admin @%{admin_nickname} requested a full backup of your Akkoma account. It's ready for download:</p>
+            <p>Admin @%{admin_nickname} requested a full backup of your Pleroma account. It's ready for download:</p>
             <p><a href="%{download_url}">%{download_url}</a></p>
             """,
             admin_nickname: admin.nickname,

lib/pleroma/http.ex

@@ -65,7 +65,7 @@ def request(method, url, body, headers, options) when is_binary(url) do
     options = put_in(options[:adapter], adapter_opts)
     params = options[:params] || []
     request = build_request(method, headers, options, url, body, params)
-    client = Tesla.client([Tesla.Middleware.FollowRedirects, Tesla.Middleware.Telemetry])
+    client = Tesla.client([Tesla.Middleware.FollowRedirects])
 
     request(client, request)
   end

lib/pleroma/http/adapter_helper.ex

@@ -47,13 +47,6 @@ def maybe_add_proxy_pool(opts, proxy) do
     |> put_in([:pools, :default, :conn_opts, :proxy], proxy)
   end
 
-  def add_pool_size(opts, pool_size) do
-    opts
-    |> maybe_add_pools()
-    |> maybe_add_default_pool()
-    |> put_in([:pools, :default, :size], pool_size)
-  end
-
   defp maybe_add_pools(opts) do
     if Keyword.has_key?(opts, :pools) do
       opts

lib/pleroma/pagination.ex

@@ -88,9 +88,9 @@ def paginate(query, options, :offset, table_binding) do
 
   defp cast_params(params) do
     param_types = %{
-      min_id: params[:id_type] || :string,
+      min_id: :string,
-      since_id: params[:id_type] || :string,
+      since_id: :string,
-      max_id: params[:id_type] || :string,
+      max_id: :string,
       offset: :integer,
       limit: :integer,
       skip_extra_order: :boolean,

lib/pleroma/password.ex

@@ -1,55 +0,0 @@
-defmodule Pleroma.Password do
-  @moduledoc """
-  This module handles password hashing and verification.
-  It will delegate to the appropriate module based on the password hash.
-  It also handles upgrading of password hashes.
-  """
-
-  alias Pleroma.User
-  alias Pleroma.Password.Pbkdf2
-  require Logger
-
-  @hashing_module Argon2
-
-  @spec hash_pwd_salt(String.t()) :: String.t()
-  defdelegate hash_pwd_salt(pass), to: @hashing_module
-
-  @spec checkpw(String.t(), String.t()) :: boolean()
-  def checkpw(password, "$2" <> _ = password_hash) do
-    # Handle bcrypt passwords for Mastodon migration
-    Bcrypt.verify_pass(password, password_hash)
-  end
-
-  def checkpw(password, "$pbkdf2" <> _ = password_hash) do
-    Pbkdf2.verify_pass(password, password_hash)
-  end
-
-  def checkpw(password, "$argon2" <> _ = password_hash) do
-    Argon2.verify_pass(password, password_hash)
-  end
-
-  def checkpw(_password, _password_hash) do
-    Logger.error("Password hash not recognized")
-    false
-  end
-
-  @spec maybe_update_password(User.t(), String.t()) ::
-          {:ok, User.t()} | {:error, Ecto.Changeset.t()}
-  def maybe_update_password(%User{password_hash: "$2" <> _} = user, password) do
-    do_update_password(user, password)
-  end
-
-  def maybe_update_password(%User{password_hash: "$6" <> _} = user, password) do
-    do_update_password(user, password)
-  end
-
-  def maybe_update_password(%User{password_hash: "$pbkdf2" <> _} = user, password) do
-    do_update_password(user, password)
-  end
-
-  def maybe_update_password(user, _), do: {:ok, user}
-
-  defp do_update_password(user, password) do
-    User.reset_password(user, %{password: password, password_confirmation: password})
-  end
-end

lib/pleroma/prometheus_exporter.ex

@@ -1,49 +0,0 @@
-defmodule Pleroma.PrometheusExporter do
-  @moduledoc """
-  Exports metrics in Prometheus format.
-  Mostly exists because of https://github.com/beam-telemetry/telemetry_metrics_prometheus_core/issues/52
-  Basically we need to fetch metrics every so often, or the lib will let them pile up and eventually crash the VM.
-  It also sorta acts as a cache so there is that too.
-  """
-
-  use GenServer
-  require Logger
-
-  def start_link(_opts) do
-    GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
-  end
-
-  def init(_opts) do
-    schedule_next()
-    {:ok, ""}
-  end
-
-  defp schedule_next do
-    Process.send_after(self(), :gather, 60_000)
-  end
-
-  # Scheduled function, gather metrics and schedule next run
-  def handle_info(:gather, _state) do
-    schedule_next()
-    state = TelemetryMetricsPrometheus.Core.scrape()
-    {:noreply, state}
-  end
-
-  # Trigger the call dynamically, mostly for testing
-  def handle_call(:gather, _from, _state) do
-    state = TelemetryMetricsPrometheus.Core.scrape()
-    {:reply, state, state}
-  end
-
-  def handle_call(:show, _from, state) do
-    {:reply, state, state}
-  end
-
-  def show do
-    GenServer.call(__MODULE__, :show)
-  end
-
-  def gather do
-    GenServer.call(__MODULE__, :gather)
-  end
-end

lib/pleroma/stats.ex

@@ -11,7 +11,7 @@ defmodule Pleroma.Stats do
   alias Pleroma.Repo
   alias Pleroma.User
 
-  @interval :timer.seconds(300)
+  @interval :timer.seconds(60)
 
   def start_link(_) do
     GenServer.start_link(
@@ -85,24 +85,14 @@ def calculate_stat_data do
         where: not u.invisible
       )
 
-    remote_users_query =
-      from(u in User,
-        where: u.is_active == true,
-        where: u.local == false,
-        where: not is_nil(u.nickname),
-        where: not u.invisible
-      )
-
     user_count = Repo.aggregate(users_query, :count, :id)
-    remote_user_count = Repo.aggregate(remote_users_query, :count, :id)
 
     %{
       peers: peers,
       stats: %{
         domain_count: domain_count,
         status_count: status_count || 0,
-        user_count: user_count,
+        user_count: user_count
-        remote_user_count: remote_user_count
       }
     }
   end

lib/pleroma/upload/filter/exiftool.ex

@@ -14,7 +14,6 @@ defmodule Pleroma.Upload.Filter.Exiftool do
   # Formats not compatible with exiftool at this time
   def filter(%Pleroma.Upload{content_type: "image/heic"}), do: {:ok, :noop}
   def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
-  def filter(%Pleroma.Upload{content_type: "image/svg+xml"}), do: {:ok, :noop}
 
   def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
     try do

lib/pleroma/user.ex

@@ -479,7 +479,7 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
     |> validate_format(:nickname, @email_regex)
     |> validate_length(:bio, max: bio_limit)
     |> validate_length(:name, max: name_limit)
-    |> validate_fields(true, struct)
+    |> validate_fields(true)
     |> validate_non_local()
   end
 
@@ -549,7 +549,7 @@ def update_changeset(struct, params \\ %{}) do
       :pleroma_settings_store,
       &{:ok, Map.merge(struct.pleroma_settings_store, &1)}
     )
-    |> validate_fields(false, struct)
+    |> validate_fields(false)
   end
 
   defp put_fields(changeset) do
@@ -2277,7 +2277,7 @@ def get_ap_ids_by_nicknames(nicknames) do
   defp put_password_hash(
          %Ecto.Changeset{valid?: true, changes: %{password: password}} = changeset
        ) do
-    change(changeset, password_hash: Pleroma.Password.hash_pwd_salt(password))
+    change(changeset, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
   end
 
   defp put_password_hash(changeset), do: changeset
@@ -2359,8 +2359,7 @@ def update_background(user, background) do
     |> update_and_set_cache()
   end
 
-  @spec validate_fields(Ecto.Changeset.t(), Boolean.t(), User.t()) :: Ecto.Changeset.t()
+  def validate_fields(changeset, remote? \\ false) do
-  def validate_fields(changeset, remote? \\ false, struct) do
     limit_name = if remote?, do: :max_remote_account_fields, else: :max_account_fields
     limit = Config.get([:instance, limit_name], 0)
 
@@ -2373,7 +2372,6 @@ def validate_fields(changeset, remote? \\ false, struct) do
         [fields: "invalid"]
       end
     end)
-    |> maybe_validate_rel_me_field(struct)
   end
 
   defp valid_field?(%{"name" => name, "value" => value}) do
@@ -2386,75 +2384,6 @@ defp valid_field?(%{"name" => name, "value" => value}) do
 
   defp valid_field?(_), do: false
 
-  defp is_url(nil), do: nil
-
-  defp is_url(uri) do
-    case URI.parse(uri) do
-      %URI{host: nil} -> false
-      %URI{scheme: nil} -> false
-      _ -> true
-    end
-  end
-
-  @spec maybe_validate_rel_me_field(Changeset.t(), User.t()) :: Changeset.t()
-  defp maybe_validate_rel_me_field(changeset, %User{ap_id: _ap_id} = struct) do
-    fields = get_change(changeset, :fields)
-    raw_fields = get_change(changeset, :raw_fields)
-
-    if is_nil(fields) do
-      changeset
-    else
-      validate_rel_me_field(changeset, fields, raw_fields, struct)
-    end
-  end
-
-  defp maybe_validate_rel_me_field(changeset, _), do: changeset
-
-  @spec validate_rel_me_field(Changeset.t(), [Map.t()], [Map.t()], User.t()) :: Changeset.t()
-  defp validate_rel_me_field(changeset, fields, raw_fields, %User{
-         nickname: nickname,
-         ap_id: ap_id
-       }) do
-    fields =
-      fields
-      |> Enum.with_index()
-      |> Enum.map(fn {%{"name" => name, "value" => value}, index} ->
-        raw_value =
-          if is_nil(raw_fields) do
-            nil
-          else
-            Enum.at(raw_fields, index)["value"]
-          end
-
-        if is_url(raw_value) do
-          frontend_url =
-            Pleroma.Web.Router.Helpers.redirect_url(
-              Pleroma.Web.Endpoint,
-              :redirector_with_meta,
-              nickname
-            )
-
-          possible_urls = [ap_id, frontend_url]
-
-          with "me" <- RelMe.maybe_put_rel_me(raw_value, possible_urls) do
-            %{
-              "name" => name,
-              "value" => value,
-              "verified_at" => DateTime.to_iso8601(DateTime.utc_now())
-            }
-          else
-            e ->
-              Logger.error("Could not check for rel=me, #{inspect(e)}")
-              %{"name" => name, "value" => value}
-          end
-        else
-          %{"name" => name, "value" => value}
-        end
-      end)
-
-    put_change(changeset, :fields, fields)
-  end
-
   defp truncate_field(%{"name" => name, "value" => value}) do
     {name, _chopped} =
       String.split_at(name, Config.get([:instance, :account_field_name_length], 255))
@@ -2622,8 +2551,11 @@ def sanitize_html(%User{} = user) do
   # - display name
   def sanitize_html(%User{} = user, filter) do
     fields =
-      Enum.map(user.fields, fn %{"value" => value} = field ->
+      Enum.map(user.fields, fn %{"name" => name, "value" => value} ->
-        Map.put(field, "value", HTML.filter_tags(value, Pleroma.HTML.Scrubber.LinksOnly))
+        %{
+          "name" => name,
+          "value" => HTML.filter_tags(value, Pleroma.HTML.Scrubber.LinksOnly)
+        }
       end)
 
     user

lib/pleroma/user/hashtag_follow.ex

@@ -43,13 +43,7 @@ def get(%User{} = user, %Hashtag{} = hashtag) do
   end
 
   def get_by_user(%User{} = user) do
-    user
+    Ecto.assoc(user, :followed_hashtags)
-    |> followed_hashtags_query()
     |> Repo.all()
   end
-
-  def followed_hashtags_query(%User{} = user) do
-    Ecto.assoc(user, :followed_hashtags)
-    |> Ecto.Query.order_by([h], desc: h.id)
-  end
 end

lib/pleroma/web.ex

@@ -132,6 +132,66 @@ defp maybe_halt_on_missing_oauth_scopes_check(conn) do
     end
   end
 
+  def view do
+    quote do
+      use Phoenix.View,
+        root: "lib/pleroma/web/templates",
+        namespace: Pleroma.Web
+
+      # Import convenience functions from controllers
+      import Phoenix.Controller, only: [get_csrf_token: 0, get_flash: 2, view_module: 1]
+
+      import Pleroma.Web.ErrorHelpers
+      import Pleroma.Web.Gettext
+
+      alias Pleroma.Web.Router.Helpers, as: Routes
+
+      require Logger
+
+      @doc "Same as `render/3` but wrapped in a rescue block"
+      def safe_render(view, template, assigns \\ %{}) do
+        Phoenix.View.render(view, template, assigns)
+      rescue
+        error ->
+          Logger.error(
+            "#{__MODULE__} failed to render #{inspect({view, template})}\n" <>
+              Exception.format(:error, error, __STACKTRACE__)
+          )
+
+          nil
+      end
+
+      @doc """
+      Same as `render_many/4` but wrapped in rescue block.
+      """
+      def safe_render_many(collection, view, template, assigns \\ %{}) do
+        Enum.map(collection, fn resource ->
+          as = Map.get(assigns, :as) || view.__resource__
+          assigns = Map.put(assigns, as, resource)
+          safe_render(view, template, assigns)
+        end)
+        |> Enum.filter(& &1)
+      end
+    end
+  end
+
+  def router do
+    quote do
+      use Phoenix.Router
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
+      import Plug.Conn
+      import Phoenix.Controller
+    end
+  end
+
+  def channel do
+    quote do
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
+      import Phoenix.Channel
+      import Pleroma.Web.Gettext
+    end
+  end
+
   def plug do
     quote do
       @behaviour Pleroma.Web.Plug
@@ -176,80 +236,6 @@ def call(%Plug.Conn{} = conn, options) do
     end
   end
 
-  def view do
-    quote do
-      use Phoenix.View,
-        root: "lib/pleroma/web/templates",
-        namespace: Pleroma.Web
-
-      # Import convenience functions from controllers
-      import Phoenix.Controller,
-        only: [get_flash: 1, get_flash: 2, view_module: 1, view_template: 1]
-
-      # Include shared imports and aliases for views
-      unquote(view_helpers())
-    end
-  end
-
-  def live_view do
-    quote do
-      use Phoenix.LiveView,
-        layout: {Pleroma.Web.LayoutView, "live.html"}
-
-      unquote(view_helpers())
-    end
-  end
-
-  def live_component do
-    quote do
-      use Phoenix.LiveComponent
-
-      unquote(view_helpers())
-    end
-  end
-
-  def component do
-    quote do
-      use Phoenix.Component
-
-      unquote(view_helpers())
-    end
-  end
-
-  def router do
-    quote do
-      use Phoenix.Router
-
-      import Plug.Conn
-      import Phoenix.Controller
-      import Phoenix.LiveView.Router
-    end
-  end
-
-  def channel do
-    quote do
-      use Phoenix.Channel
-      import Pleroma.Web.Gettext
-    end
-  end
-
-  defp view_helpers do
-    quote do
-      # Use all HTML functionality (forms, tags, etc)
-      use Phoenix.HTML
-
-      # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
-      import Phoenix.LiveView.Helpers
-
-      # Import basic rendering functionality (render, render_layout, etc)
-      import Phoenix.View
-
-      import Pleroma.Web.ErrorHelpers
-      import Pleroma.Web.Gettext
-      alias Pleroma.Web.Router.Helpers, as: Routes
-    end
-  end
-
   @doc """
   When used, dispatch to the appropriate controller/view/etc.
   """

lib/pleroma/web/admin_api/views/status_view.ex

@@ -14,11 +14,11 @@ defmodule Pleroma.Web.AdminAPI.StatusView do
   defdelegate merge_account_views(user), to: AdminAPI.AccountView
 
   def render("index.json", %{total: total} = opts) do
-    %{total: total, activities: render_many(opts.activities, __MODULE__, "show.json", opts)}
+    %{total: total, activities: safe_render_many(opts.activities, __MODULE__, "show.json", opts)}
   end
 
   def render("index.json", opts) do
-    render_many(opts.activities, __MODULE__, "show.json", opts)
+    safe_render_many(opts.activities, __MODULE__, "show.json", opts)
   end
 
   def render("show.json", %{activity: %{data: %{"object" => _object}} = activity} = opts) do

lib/pleroma/web/akkoma_api/controllers/metrics_controller.ex

@@ -1,24 +0,0 @@
-defmodule Pleroma.Web.AkkomaAPI.MetricsController do
-  use Pleroma.Web, :controller
-
-  alias Pleroma.Web.Plugs.OAuthScopesPlug
-  alias Pleroma.Config
-
-  plug(
-    OAuthScopesPlug,
-    %{scopes: ["admin:metrics"]}
-    when action in [
-           :show
-         ]
-  )
-
-  def show(conn, _params) do
-    if Config.get([:instance, :export_prometheus_metrics], true) do
-      conn
-      |> text(Pleroma.PrometheusExporter.show())
-    else
-      conn
-      |> send_resp(404, "Not Found")
-    end
-  end
-end

lib/pleroma/web/api_spec.ex

@@ -23,19 +23,19 @@ def spec(opts \\ []) do
           []
         end,
       info: %OpenApiSpex.Info{
-        title: "Akkoma API",
+        title: "Pleroma API",
         description: """
-        This is documentation for the Akkoma API. Most of the endpoints and entities come
+        This is documentation for client Pleroma API. Most of the endpoints and entities come
         from Mastodon API and have custom extensions on top.
 
-        While this document aims to be a complete guide to the client API Akkoma exposes,
+        While this document aims to be a complete guide to the client API Pleroma exposes,
-        it may not be complete. Some endpoints may have incomplete or poorly worded documentation.
+        the details are still being worked out. Some endpoints may have incomplete or poorly worded documentation.
         You might want to check the following resources if something is not clear:
         - [Legacy Pleroma-specific endpoint documentation](https://docs-develop.pleroma.social/backend/development/API/pleroma_api/)
         - [Mastodon API documentation](https://docs.joinmastodon.org/client/intro/)
-        - [Differences in Mastodon API responses from vanilla Mastodon](https://docs.akkoma.dev/stable/development/API/differences_in_mastoapi_responses/)
+        - [Differences in Mastodon API responses from vanilla Mastodon](https://docs-develop.pleroma.social/backend/development/API/differences_in_mastoapi_responses/)
 
-        Please report such occurrences on our [issue tracker](https://akkoma.dev/AkkomaGang/akkoma). Feel free to submit API questions or proposals there too!
+        Please report such occurences on our [issue tracker](https://git.pleroma.social/pleroma/pleroma/-/issues). Feel free to submit API questions or proposals there too!
         """,
         # Strip environment from the version
         version: Application.spec(:pleroma, :vsn) |> to_string() |> String.replace(~r/\+.*$/, ""),

lib/pleroma/web/api_spec/operations/account_operation.ex

@@ -432,7 +432,6 @@ def lookup_operation do
       ],
       responses: %{
         200 => Operation.response("Account", "application/json", Account),
-        401 => Operation.response("Error", "application/json", ApiError),
         404 => Operation.response("Error", "application/json", ApiError)
       }
     }

lib/pleroma/web/api_spec/operations/tag_operation.ex

@@ -44,7 +44,7 @@ def unfollow_operation do
       tags: ["Tags"],
       summary: "Unfollow a hashtag",
       description: "Unfollow a hashtag",
-      security: [%{"oAuth" => ["write:follows"]}],
+      security: [%{"oAuth" => ["write:follow"]}],
       parameters: [id_param()],
       operationId: "TagController.unfollow",
       responses: %{
@@ -54,26 +54,6 @@ def unfollow_operation do
     }
   end
 
-  def show_followed_operation do
-    %Operation{
-      tags: ["Tags"],
-      summary: "Followed hashtags",
-      description: "View a list of hashtags the currently authenticated user is following",
-      parameters: pagination_params(),
-      security: [%{"oAuth" => ["read:follows"]}],
-      operationId: "TagController.show_followed",
-      responses: %{
-        200 =>
-          Operation.response("Hashtags", "application/json", %Schema{
-            type: :array,
-            items: Tag
-          }),
-        403 => Operation.response("Forbidden", "application/json", ApiError),
-        404 => Operation.response("Not Found", "application/json", ApiError)
-      }
-    }
-  end
-
   defp id_param do
     Operation.parameter(
       :id,
@@ -82,22 +62,4 @@ defp id_param do
       "Name of the hashtag"
     )
   end
-
-  def pagination_params do
-    [
-      Operation.parameter(:max_id, :query, :integer, "Return items older than this ID"),
-      Operation.parameter(
-        :min_id,
-        :query,
-        :integer,
-        "Return the oldest items newer than this ID"
-      ),
-      Operation.parameter(
-        :limit,
-        :query,
-        %Schema{type: :integer, default: 20},
-        "Maximum number of items to return. Will be ignored if it's more than 40"
-      )
-    ]
-  end
 end

lib/pleroma/web/api_spec/schemas/tag.ex

@@ -21,12 +21,6 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Tag do
       following: %Schema{
         type: :boolean,
         description: "Whether the authenticated user is following the hashtag"
-      },
-      history: %Schema{
-        type: :array,
-        items: %Schema{type: :string},
-        description:
-          "A list of historical uses of the hashtag (not implemented, for compatibility only)"
       }
     },
     example: %{

lib/pleroma/web/auth/pleroma_authenticator.ex

@@ -6,6 +6,7 @@ defmodule Pleroma.Web.Auth.PleromaAuthenticator do
   alias Pleroma.Registration
   alias Pleroma.Repo
   alias Pleroma.User
+  alias Pleroma.Web.Plugs.AuthenticationPlug
 
   import Pleroma.Web.Auth.Helpers, only: [fetch_credentials: 1, fetch_user: 1]
 
@@ -14,8 +15,8 @@ defmodule Pleroma.Web.Auth.PleromaAuthenticator do
   def get_user(%Plug.Conn{} = conn) do
     with {:ok, {name, password}} <- fetch_credentials(conn),
          {_, %User{} = user} <- {:user, fetch_user(name)},
-         {_, true} <- {:checkpw, Pleroma.Password.checkpw(password, user.password_hash)},
+         {_, true} <- {:checkpw, AuthenticationPlug.checkpw(password, user.password_hash)},
-         {:ok, user} <- Pleroma.Password.maybe_update_password(user, password) do
+         {:ok, user} <- AuthenticationPlug.maybe_update_password(user, password) do
       {:ok, user}
     else
       {:error, _reason} = error -> error

lib/pleroma/web/auth/totp_authenticator.ex

@@ -6,6 +6,7 @@ defmodule Pleroma.Web.Auth.TOTPAuthenticator do
   alias Pleroma.MFA
   alias Pleroma.MFA.TOTP
   alias Pleroma.User
+  alias Pleroma.Web.Plugs.AuthenticationPlug
 
   @doc "Verify code or check backup code."
   @spec verify(String.t(), User.t()) ::
@@ -30,7 +31,7 @@ def verify_recovery_code(
         code
       )
       when is_list(codes) and is_binary(code) do
-    hash_code = Enum.find(codes, fn hash -> Pleroma.Password.checkpw(code, hash) end)
+    hash_code = Enum.find(codes, fn hash -> AuthenticationPlug.checkpw(code, hash) end)
 
     if hash_code do
       MFA.invalidate_backup_code(user, hash_code)

lib/pleroma/web/common_api/activity_draft.ex

@@ -177,7 +177,7 @@ defp to_and_cc(draft) do
   end
 
   defp context(draft) do
-    context = Utils.make_context(draft)
+    context = Utils.make_context(draft.in_reply_to, draft.in_reply_to_conversation)
     %__MODULE__{draft | context: context}
   end
 

lib/pleroma/web/common_api/utils.ex

@@ -17,6 +17,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
   alias Pleroma.Web.ActivityPub.Visibility
   alias Pleroma.Web.CommonAPI.ActivityDraft
   alias Pleroma.Web.MediaProxy
+  alias Pleroma.Web.Plugs.AuthenticationPlug
   alias Pleroma.Web.Utils.Params
 
   require Logger
@@ -230,13 +231,12 @@ def get_content_type(content_type) do
     end
   end
 
-  def make_context(%{in_reply_to_conversation: %Participation{} = participation}) do
+  def make_context(_, %Participation{} = participation) do
     Repo.preload(participation, :conversation).conversation.ap_id
   end
 
-  def make_context(%{in_reply_to: %Activity{data: %{"context" => context}}}), do: context
+  def make_context(%Activity{data: %{"context" => context}}, _), do: context
-  def make_context(%{quote: %Activity{data: %{"context" => context}}}), do: context
+  def make_context(_, _), do: Utils.generate_context_id()
-  def make_context(_), do: Utils.generate_context_id()
 
   def maybe_add_attachments(parsed, _attachments, false = _no_links), do: parsed
 
@@ -356,7 +356,7 @@ defp shortname(name) do
   @spec confirm_current_password(User.t(), String.t()) :: {:ok, User.t()} | {:error, String.t()}
   def confirm_current_password(user, password) do
     with %User{local: true} = db_user <- User.get_cached_by_id(user.id),
-         true <- Pleroma.Password.checkpw(password, db_user.password_hash) do
+         true <- AuthenticationPlug.checkpw(password, db_user.password_hash) do
       {:ok, db_user}
     else
       _ -> {:error, dgettext("errors", "Invalid password.")}

lib/pleroma/web/endpoint.ex

@@ -13,7 +13,6 @@ defmodule Pleroma.Web.Endpoint do
 
   plug(Pleroma.Web.Plugs.SetLocalePlug)
   plug(CORSPlug)
-  plug(Pleroma.Web.Plugs.CSPNoncePlug)
   plug(Pleroma.Web.Plugs.HTTPSecurityPlug)
   plug(Pleroma.Web.Plugs.UploadedMedia)
 

lib/pleroma/web/mastodon_api/controllers/account_controller.ex

@@ -32,14 +32,14 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
 
   plug(Pleroma.Web.ApiSpec.CastAndValidate)
 
-  plug(:skip_auth when action in [:create])
+  plug(:skip_auth when action in [:create, :lookup])
 
   plug(:skip_public_check when action in [:show, :statuses])
 
   plug(
     OAuthScopesPlug,
     %{fallback: :proceed_unauthenticated, scopes: ["read:accounts"]}
-    when action in [:show, :followers, :following, :lookup]
+    when action in [:show, :followers, :following]
   )
 
   plug(
@@ -521,9 +521,8 @@ def blocks(%{assigns: %{user: user}} = conn, params) do
   end
 
   @doc "GET /api/v1/accounts/lookup"
-  def lookup(%{assigns: %{user: for_user}} = conn, %{acct: nickname} = _params) do
+  def lookup(conn, %{acct: nickname} = _params) do
-    with %User{} = user <- User.get_by_nickname(nickname),
+    with %User{} = user <- User.get_by_nickname(nickname) do
-         :visible <- User.visible_for(user, for_user) do
       render(conn, "show.json",
         user: user,
         skip_visibility_check: true

lib/pleroma/web/mastodon_api/controllers/tag_controller.ex

@@ -4,24 +4,9 @@ defmodule Pleroma.Web.MastodonAPI.TagController do
 
   alias Pleroma.User
   alias Pleroma.Hashtag
-  alias Pleroma.Pagination
-
-  import Pleroma.Web.ControllerHelper,
-    only: [
-      add_link_headers: 2
-    ]
 
   plug(Pleroma.Web.ApiSpec.CastAndValidate)
-
+  plug(Pleroma.Web.Plugs.OAuthScopesPlug, %{scopes: ["read"]} when action in [:show])
-  plug(
-    Pleroma.Web.Plugs.OAuthScopesPlug,
-    %{scopes: ["read"]} when action in [:show]
-  )
-
-  plug(
-    Pleroma.Web.Plugs.OAuthScopesPlug,
-    %{scopes: ["read:follows"]} when action in [:show_followed]
-  )
 
   plug(
     Pleroma.Web.Plugs.OAuthScopesPlug,
@@ -59,19 +44,4 @@ def unfollow(conn, %{id: id}) do
       _ -> render_error(conn, :not_found, "Hashtag not found")
     end
   end
-
-  def show_followed(conn, params) do
-    with %{assigns: %{user: %User{} = user}} <- conn do
-      params = Map.put(params, :id_type, :integer)
-
-      hashtags =
-        user
-        |> User.HashtagFollow.followed_hashtags_query()
-        |> Pagination.fetch_paginated(params)
-
-      conn
-      |> add_link_headers(hashtags)
-      |> render("index.json", tags: hashtags, for_user: user)
-    end
-  end
 end

lib/pleroma/web/mastodon_api/views/conversation_view.ex

@@ -12,7 +12,7 @@ defmodule Pleroma.Web.MastodonAPI.ConversationView do
   alias Pleroma.Web.MastodonAPI.StatusView
 
   def render("participations.json", %{participations: participations, for: user}) do
-    render_many(participations, __MODULE__, "participation.json", %{
+    safe_render_many(participations, __MODULE__, "participation.json", %{
       as: :participation,
       for: user
     })

lib/pleroma/web/mastodon_api/views/notification_view.ex

@@ -66,7 +66,7 @@ def render("index.json", %{notifications: notifications, for: reading_user} = op
       |> Map.put(:parent_activities, parent_activities)
       |> Map.put(:relationships, relationships_opt)
 
-    render_many(notifications, NotificationView, "show.json", opts)
+    safe_render_many(notifications, NotificationView, "show.json", opts)
   end
 
   def render(

lib/pleroma/web/mastodon_api/views/status_view.ex

@@ -131,7 +131,7 @@ def render("index.json", opts) do
       |> Map.put(:parent_activities, parent_activities)
       |> Map.put(:relationships, relationships_opt)
 
-    render_many(activities, StatusView, "show.json", opts)
+    safe_render_many(activities, StatusView, "show.json", opts)
   end
 
   def render(

lib/pleroma/web/mastodon_api/views/tag_view.ex

@@ -3,10 +3,6 @@ defmodule Pleroma.Web.MastodonAPI.TagView do
   alias Pleroma.User
   alias Pleroma.Web.Router.Helpers
 
-  def render("index.json", %{tags: tags, for_user: user}) do
-    render_many(tags, __MODULE__, "show.json", %{for_user: user})
-  end
-
   def render("show.json", %{tag: tag, for_user: user}) do
     following =
       with %User{} <- user do

lib/pleroma/web/mongoose_im/mongoose_im_controller.ex

@@ -7,6 +7,7 @@ defmodule Pleroma.Web.MongooseIM.MongooseIMController do
 
   alias Pleroma.Repo
   alias Pleroma.User
+  alias Pleroma.Web.Plugs.AuthenticationPlug
   alias Pleroma.Web.Plugs.RateLimiter
 
   plug(RateLimiter, [name: :authentication] when action in [:user_exists, :check_password])
@@ -27,7 +28,7 @@ def user_exists(conn, %{"user" => username}) do
   def check_password(conn, %{"user" => username, "pass" => password}) do
     with %User{password_hash: password_hash, is_active: true} <-
            Repo.get_by(User, nickname: username, local: true),
-         true <- Pleroma.Password.checkpw(password, password_hash) do
+         true <- AuthenticationPlug.checkpw(password, password_hash) do
       conn
       |> json(true)
     else

lib/pleroma/web/o_auth/o_auth_controller.ex

@@ -211,11 +211,11 @@ defp handle_create_authorization_error(
          {:error, scopes_issue},
          %{"authorization" => _} = params
        )
-       when scopes_issue in [:unsupported_scopes, :missing_scopes, :user_is_not_an_admin] do
+       when scopes_issue in [:unsupported_scopes, :missing_scopes] do
     # Per https://github.com/tootsuite/mastodon/blob/
     #   51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L39
     conn
-    |> put_flash(:error, dgettext("errors", "This action is outside of authorized scopes"))
+    |> put_flash(:error, dgettext("errors", "This action is outside the authorized scopes"))
     |> put_status(:unauthorized)
     |> authorize(params)
   end
@@ -605,8 +605,7 @@ defp do_create_authorization(
   defp do_create_authorization(%User{} = user, %App{} = app, requested_scopes)
        when is_list(requested_scopes) do
     with {:account_status, :active} <- {:account_status, User.account_status(user)},
-         requested_scopes <- Scopes.filter_admin_scopes(requested_scopes, user),
+         {:ok, scopes} <- validate_scopes(app, requested_scopes),
-         {:ok, scopes} <- validate_scopes(user, app, requested_scopes),
          {:ok, auth} <- Authorization.create_authorization(app, user, scopes) do
       {:ok, auth}
     end
@@ -638,16 +637,15 @@ defp build_and_response_mfa_token(user, auth) do
     end
   end
 
-  @spec validate_scopes(User.t(), App.t(), map() | list()) ::
+  @spec validate_scopes(App.t(), map() | list()) ::
           {:ok, list()} | {:error, :missing_scopes | :unsupported_scopes}
-  defp validate_scopes(%User{} = user, %App{} = app, params) when is_map(params) do
+  defp validate_scopes(%App{} = app, params) when is_map(params) do
     requested_scopes = Scopes.fetch_scopes(params, app.scopes)
-    validate_scopes(user, app, requested_scopes)
+    validate_scopes(app, requested_scopes)
   end
 
-  defp validate_scopes(%User{} = user, %App{} = app, requested_scopes)
+  defp validate_scopes(%App{} = app, requested_scopes) when is_list(requested_scopes) do
-       when is_list(requested_scopes) do
+    Scopes.validate(requested_scopes, app.scopes)
-    Scopes.validate(requested_scopes, app.scopes, user)
   end
 
   def default_redirect_uri(%App{} = app) do

lib/pleroma/web/o_auth/scopes.ex

@@ -56,27 +56,12 @@ def to_string(scopes), do: Enum.join(scopes, " ")
   @doc """
   Validates scopes.
   """
-  @spec validate(list() | nil, list(), Pleroma.User.t()) ::
+  @spec validate(list() | nil, list()) ::
-          {:ok, list()} | {:error, :missing_scopes | :unsupported_scopes, :user_is_not_an_admin}
+          {:ok, list()} | {:error, :missing_scopes | :unsupported_scopes}
-  def validate(blank_scopes, _app_scopes, _user) when blank_scopes in [nil, []],
+  def validate(blank_scopes, _app_scopes) when blank_scopes in [nil, []],
     do: {:error, :missing_scopes}
 
-  def validate(scopes, app_scopes, _user) do
+  def validate(scopes, app_scopes) do
-    validate_scopes_are_supported(scopes, app_scopes)
-  end
-
-  @spec filter_admin_scopes([String.t()], Pleroma.User.t()) :: [String.t()]
-  @doc """
-  Remove admin scopes for non-admins
-  """
-  def filter_admin_scopes(scopes, %Pleroma.User{is_admin: true}), do: scopes
-
-  def filter_admin_scopes(scopes, _user) do
-    drop_scopes = OAuthScopesPlug.filter_descendants(scopes, ["admin"])
-    Enum.reject(scopes, fn scope -> Enum.member?(drop_scopes, scope) end)
-  end
-
-  defp validate_scopes_are_supported(scopes, app_scopes) do
     case OAuthScopesPlug.filter_descendants(scopes, app_scopes) do
       ^scopes -> {:ok, scopes}
       _ -> {:error, :unsupported_scopes}

lib/pleroma/web/plugs/authentication_plug.ex

@@ -7,7 +7,6 @@ defmodule Pleroma.Web.Plugs.AuthenticationPlug do
 
   alias Pleroma.Helpers.AuthHelper
   alias Pleroma.User
-  alias Pleroma.Password
 
   import Plug.Conn
 
@@ -26,8 +25,8 @@ def call(
         } = conn,
         _
       ) do
-    if Password.checkpw(password, password_hash) do
+    if checkpw(password, password_hash) do
-      {:ok, auth_user} = Password.maybe_update_password(auth_user, password)
+      {:ok, auth_user} = maybe_update_password(auth_user, password)
 
       conn
       |> assign(:user, auth_user)
@@ -39,6 +38,35 @@ def call(
 
   def call(conn, _), do: conn
 
-  @spec checkpw(String.t(), String.t()) :: boolean
+  def checkpw(password, "$6" <> _ = password_hash) do
-  defdelegate checkpw(password, hash), to: Password
+    :crypt.crypt(password, password_hash) == password_hash
+  end
+
+  def checkpw(password, "$2" <> _ = password_hash) do
+    # Handle bcrypt passwords for Mastodon migration
+    Bcrypt.verify_pass(password, password_hash)
+  end
+
+  def checkpw(password, "$pbkdf2" <> _ = password_hash) do
+    Pleroma.Password.Pbkdf2.verify_pass(password, password_hash)
+  end
+
+  def checkpw(_password, _password_hash) do
+    Logger.error("Password hash not recognized")
+    false
+  end
+
+  def maybe_update_password(%User{password_hash: "$2" <> _} = user, password) do
+    do_update_password(user, password)
+  end
+
+  def maybe_update_password(%User{password_hash: "$6" <> _} = user, password) do
+    do_update_password(user, password)
+  end
+
+  def maybe_update_password(user, _), do: {:ok, user}
+
+  defp do_update_password(user, password) do
+    User.reset_password(user, %{password: password, password_confirmation: password})
+  end
 end

lib/pleroma/web/plugs/csp_nonce_plug.ex

@@ -1,21 +0,0 @@
-defmodule Pleroma.Web.Plugs.CSPNoncePlug do
-  import Plug.Conn
-
-  def init(opts) do
-    opts
-  end
-
-  def call(conn, _opts) do
-    assign_csp_nonce(conn)
-  end
-
-  defp assign_csp_nonce(conn) do
-    nonce =
-      :crypto.strong_rand_bytes(128)
-      |> Base.url_encode64()
-      |> binary_part(0, 15)
-
-    conn
-    |> assign(:csp_nonce, nonce)
-  end
-end

lib/pleroma/web/plugs/ensure_http_signature_plug.ex

@@ -1,31 +0,0 @@
-# Akkoma: Magically expressive social media
-# Copyright © 2022-2022 Akkoma Authors <https://akkoma.dev/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.Plugs.EnsureHTTPSignaturePlug do
-  @moduledoc """
-  Ensures HTTP signature has been validated by previous plugs on ActivityPub requests.
-  """
-  import Plug.Conn
-  import Phoenix.Controller, only: [get_format: 1, text: 2]
-
-  alias Pleroma.Config
-
-  def init(options) do
-    options
-  end
-
-  def call(%{assigns: %{valid_signature: true}} = conn, _), do: conn
-
-  def call(conn, _) do
-    with true <- get_format(conn) in ["json", "activity+json"],
-         true <- Config.get([:activitypub, :authorized_fetch_mode], true) do
-      conn
-      |> put_status(:unauthorized)
-      |> text("Request not signed")
-      |> halt()
-    else
-      _ -> conn
-    end
-  end
-end

lib/pleroma/web/plugs/http_security_plug.ex

@@ -13,7 +13,7 @@ def init(opts), do: opts
   def call(conn, _options) do
     if Config.get([:http_security, :enabled]) do
       conn
-      |> merge_resp_headers(headers(conn))
+      |> merge_resp_headers(headers())
       |> maybe_send_sts_header(Config.get([:http_security, :sts]))
     else
       conn
@@ -36,8 +36,7 @@ def custom_http_frontend_headers do
     end
   end
 
-  @spec headers(Plug.Conn.t()) :: [{String.t(), String.t()}]
+  def headers do
-  def headers(conn) do
     referrer_policy = Config.get([:http_security, :referrer_policy])
     report_uri = Config.get([:http_security, :report_uri])
     custom_http_frontend_headers = custom_http_frontend_headers()
@@ -48,7 +47,7 @@ def headers(conn) do
       {"x-frame-options", "DENY"},
       {"x-content-type-options", "nosniff"},
       {"referrer-policy", referrer_policy},
-      {"content-security-policy", csp_string(conn)},
+      {"content-security-policy", csp_string()},
       {"permissions-policy", "interest-cohort=()"}
     ]
 
@@ -78,18 +77,19 @@ def headers(conn) do
     "default-src 'none'",
     "base-uri 'none'",
     "frame-ancestors 'none'",
+    "style-src 'self' 'unsafe-inline'",
+    "font-src 'self'",
     "manifest-src 'self'"
   ]
 
   @csp_start [Enum.join(static_csp_rules, ";") <> ";"]
 
-  defp csp_string(conn) do
+  defp csp_string do
     scheme = Config.get([Pleroma.Web.Endpoint, :url])[:scheme]
     static_url = Pleroma.Web.Endpoint.static_url()
     websocket_url = Pleroma.Web.Endpoint.websocket_url()
     report_uri = Config.get([:http_security, :report_uri])
-    %{assigns: %{csp_nonce: nonce}} = conn
+
-    nonce_tag = "nonce-" <> nonce
     img_src = "img-src 'self' data: blob:"
     media_src = "media-src 'self'"
 
@@ -106,15 +106,17 @@ defp csp_string(conn) do
     connect_src =
       if Config.get([:media_proxy, :enabled]) do
         sources = build_csp_multimedia_source_list()
-        ["connect-src 'self' ", static_url, ?\s, websocket_url, ?\s, sources]
+        ["connect-src 'self' blob: ", static_url, ?\s, websocket_url, ?\s, sources]
       else
-        ["connect-src 'self' ", static_url, ?\s, websocket_url]
+        ["connect-src 'self' blob: ", static_url, ?\s, websocket_url]
       end
 
-    style_src = "style-src 'self' '#{nonce_tag}'"
+    script_src =
-    font_src = "font-src 'self'"
+      if Config.get(:env) == :dev do
-
+        "script-src 'self' 'unsafe-eval'"
-    script_src = "script-src 'self' '#{nonce_tag}'"
+      else
+        "script-src 'self'"
+      end
 
     report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"]
     insecure = if scheme == "https", do: "upgrade-insecure-requests"
@@ -124,8 +126,6 @@ defp csp_string(conn) do
     |> add_csp_param(media_src)
     |> add_csp_param(connect_src)
     |> add_csp_param(script_src)
-    |> add_csp_param(font_src)
-    |> add_csp_param(style_src)
     |> add_csp_param(insecure)
     |> add_csp_param(report)
     |> :erlang.iolist_to_binary()

lib/pleroma/web/plugs/http_signature_plug.ex

@@ -4,7 +4,7 @@
 
 defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
   import Plug.Conn
-  import Phoenix.Controller, only: [get_format: 1]
+  import Phoenix.Controller, only: [get_format: 1, text: 2]
   alias Pleroma.Activity
   alias Pleroma.Web.Router
   alias Pleroma.Signature
@@ -22,7 +22,7 @@ def call(%{assigns: %{valid_signature: true}} = conn, _opts) do
   end
 
   def call(conn, _opts) do
-    if get_format(conn) in ["json", "activity+json"] do
+    if get_format(conn) == "activity+json" do
       conn
       |> maybe_assign_valid_signature()
       |> maybe_require_signature()
@@ -113,7 +113,18 @@ defp maybe_require_signature(
     conn
   end
 
-  defp maybe_require_signature(conn), do: conn
+  defp maybe_require_signature(%{assigns: %{valid_signature: true}} = conn), do: conn
+
+  defp maybe_require_signature(conn) do
+    if Pleroma.Config.get([:activitypub, :authorized_fetch_mode], false) do
+      conn
+      |> put_status(:unauthorized)
+      |> text("Request not signed")
+      |> halt()
+    else
+      conn
+    end
+  end
 
   defp signature_host(conn) do
     with %{"keyId" => kid} <- HTTPSignatures.signature_for_conn(conn),

lib/pleroma/web/plugs/rate_limiter.ex

@@ -197,18 +197,12 @@ defp incorporate_conn_info(action_settings, %{params: params} = conn) do
     })
   end
 
-  defp ip(%{remote_ip: remote_ip}) when is_binary(remote_ip) do
+  defp ip(%{remote_ip: remote_ip}) do
-    remote_ip
-  end
-
-  defp ip(%{remote_ip: remote_ip}) when is_tuple(remote_ip) do
     remote_ip
     |> Tuple.to_list()
     |> Enum.join(".")
   end
 
-  defp ip(_), do: nil
-
   defp render_throttled_error(conn) do
     conn
     |> render_error(:too_many_requests, "Throttled")

lib/pleroma/web/preload.ex

@@ -5,7 +5,7 @@
 defmodule Pleroma.Web.Preload do
   alias Phoenix.HTML
 
-  def build_tags(%{assigns: %{csp_nonce: nonce}}, params) do
+  def build_tags(_conn, params) do
     preload_data =
       Enum.reduce(Pleroma.Config.get([__MODULE__, :providers], []), %{}, fn parser, acc ->
         terms =
@@ -20,17 +20,16 @@ def build_tags(%{assigns: %{csp_nonce: nonce}}, params) do
     rendered_html =
       preload_data
       |> Jason.encode!()
-      |> build_script_tag(nonce)
+      |> build_script_tag()
       |> HTML.safe_to_string()
 
     rendered_html
   end
 
-  def build_script_tag(content, nonce) do
+  def build_script_tag(content) do
     HTML.Tag.content_tag(:script, HTML.raw(content),
       id: "initial-results",
-      type: "application/json",
+      type: "application/json"
-      nonce: nonce
     )
   end
 end

lib/pleroma/web/rel_me.ex

@@ -38,11 +38,12 @@ defp parse_url(url) do
 
   def maybe_put_rel_me("http" <> _ = target_page, profile_urls) when is_list(profile_urls) do
     {:ok, rel_me_hrefs} = parse(target_page)
+
     true = Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end)
 
     "me"
   rescue
-    e -> nil
+    _ -> nil
   end
 
   def maybe_put_rel_me(_, _) do

lib/pleroma/web/rich_media/parser.ex

@@ -15,7 +15,7 @@ def parse(nil), do: {:error, "No URL provided"}
 
   if Pleroma.Config.get(:env) == :test do
     @spec parse(String.t()) :: {:ok, map()} | {:error, any()}
-    def parse(url), do: parse_with_timeout(url)
+    def parse(url), do: parse_url(url)
   else
     @spec parse(String.t()) :: {:ok, map()} | {:error, any()}
     def parse(url) do
@@ -27,7 +27,7 @@ def parse(url) do
 
     defp get_cached_or_parse(url) do
       case @cachex.fetch(:rich_media_cache, url, fn ->
-             case parse_with_timeout(url) do
+             case parse_url(url) do
                {:ok, _} = res ->
                  {:commit, res}
 
@@ -141,21 +141,6 @@ def parse_url(url) do
     end
   end
 
-  def parse_with_timeout(url) do
-    try do
-      task =
-        Task.Supervisor.async_nolink(Pleroma.TaskSupervisor, fn ->
-          parse_url(url)
-        end)
-
-      Task.await(task, 5000)
-    catch
-      :exit, {:timeout, _} ->
-        Logger.warn("Timeout while fetching rich media for #{url}")
-        {:error, :timeout}
-    end
-  end
-
   defp maybe_parse(html) do
     Enum.reduce_while(parsers(), %{}, fn parser, acc ->
       case parser.parse(html, acc) do

lib/pleroma/web/router.ex

@@ -147,7 +147,6 @@ defmodule Pleroma.Web.Router do
   pipeline :http_signature do
     plug(Pleroma.Web.Plugs.HTTPSignaturePlug)
     plug(Pleroma.Web.Plugs.MappedSignatureToIdentityPlug)
-    plug(Pleroma.Web.Plugs.EnsureHTTPSignaturePlug)
   end
 
   pipeline :static_fe do
@@ -468,7 +467,6 @@ defmodule Pleroma.Web.Router do
 
   scope "/api/v1/akkoma", Pleroma.Web.AkkomaAPI do
     pipe_through(:authenticated_api)
-    get("/metrics", MetricsController, :show)
     get("/translation/languages", TranslationController, :languages)
 
     get("/frontend_settings/:frontend_name", FrontendSettingsController, :list_profiles)
@@ -606,7 +604,6 @@ defmodule Pleroma.Web.Router do
     get("/tags/:id", TagController, :show)
     post("/tags/:id/follow", TagController, :follow)
     post("/tags/:id/unfollow", TagController, :unfollow)
-    get("/followed_tags", TagController, :show_followed)
   end
 
   scope "/api/web", Pleroma.Web do
@@ -870,11 +867,7 @@ defmodule Pleroma.Web.Router do
 
   scope "/" do
     pipe_through([:pleroma_html, :authenticate, :require_admin])
-
+    live_dashboard("/phoenix/live_dashboard")
-    live_dashboard("/phoenix/live_dashboard",
-      metrics: {Pleroma.Web.Telemetry, :live_dashboard_metrics},
-      csp_nonce_assign_key: :csp_nonce
-    )
   end
 
   # Test-only routes needed to test action dispatching and plug chain execution
@@ -913,7 +906,6 @@ defmodule Pleroma.Web.Router do
   scope "/", Pleroma.Web.Fallback do
     get("/registration/:token", RedirectController, :registration_page)
     get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
-    get("/api/*path", RedirectController, :api_not_implemented)
     get("/*path", RedirectController, :redirector_with_preload)
 
     options("/*path", RedirectController, :empty)
@@ -921,7 +913,7 @@ defmodule Pleroma.Web.Router do
 
   # TODO: Change to Phoenix.Router.routes/1 for Phoenix 1.6.0+
   def get_api_routes do
-    Phoenix.Router.routes(__MODULE__)
+    __MODULE__.__routes__()
     |> Enum.reject(fn r -> r.plug == Pleroma.Web.Fallback.RedirectController end)
     |> Enum.map(fn r ->
       r.path

lib/pleroma/web/telemetry.ex

@@ -1,148 +0,0 @@
-defmodule Pleroma.Web.Telemetry do
-  use Supervisor
-  import Telemetry.Metrics
-  alias Pleroma.Stats
-  alias Pleroma.Config
-
-  def start_link(arg) do
-    Supervisor.start_link(__MODULE__, arg, name: __MODULE__)
-  end
-
-  @impl true
-  def init(_arg) do
-    children =
-      [
-        {:telemetry_poller, measurements: periodic_measurements(), period: 10_000}
-      ] ++
-        prometheus_children()
-
-    Supervisor.init(children, strategy: :one_for_one)
-  end
-
-  defp prometheus_children do
-    config = Config.get([:instance, :export_prometheus_metrics], true)
-
-    if config do
-      [
-        {TelemetryMetricsPrometheus.Core, metrics: prometheus_metrics()},
-        Pleroma.PrometheusExporter
-      ]
-    else
-      []
-    end
-  end
-
-  # A seperate set of metrics for distributions because phoenix dashboard does NOT handle them well
-  defp distribution_metrics do
-    [
-      distribution(
-        "phoenix.router_dispatch.stop.duration",
-        # event_name: [:pleroma, :repo, :query, :total_time],
-        measurement: :duration,
-        unit: {:native, :second},
-        tags: [:route],
-        reporter_options: [
-          buckets: [0.1, 0.2, 0.5, 1, 2.5, 5, 10, 25, 50, 100, 250, 500, 1000]
-        ]
-      ),
-
-      # Database Time Metrics
-      distribution(
-        "pleroma.repo.query.total_time",
-        # event_name: [:pleroma, :repo, :query, :total_time],
-        measurement: :total_time,
-        unit: {:native, :millisecond},
-        reporter_options: [
-          buckets: [0.1, 0.2, 0.5, 1, 2.5, 5, 10, 25, 50, 100, 250, 500, 1000]
-        ]
-      ),
-      distribution(
-        "pleroma.repo.query.queue_time",
-        # event_name: [:pleroma, :repo, :query, :total_time],
-        measurement: :queue_time,
-        unit: {:native, :millisecond},
-        reporter_options: [
-          buckets: [0.01, 0.025, 0.05, 0.1, 0.2, 0.5, 1, 2.5, 5, 10]
-        ]
-      ),
-      distribution(
-        "oban_job_exception",
-        event_name: [:oban, :job, :exception],
-        measurement: :duration,
-        tags: [:worker],
-        tag_values: fn tags -> Map.put(tags, :worker, tags.job.worker) end,
-        unit: {:native, :second},
-        reporter_options: [
-          buckets: [0.01, 0.025, 0.05, 0.1, 0.2, 0.5, 1, 2.5, 5, 10]
-        ]
-      ),
-      distribution(
-        "tesla_request_completed",
-        event_name: [:tesla, :request, :stop],
-        measurement: :duration,
-        tags: [:response_code],
-        tag_values: fn tags -> Map.put(tags, :response_code, tags.env.status) end,
-        unit: {:native, :second},
-        reporter_options: [
-          buckets: [0.01, 0.025, 0.05, 0.1, 0.2, 0.5, 1, 2.5, 5, 10]
-        ]
-      ),
-      distribution(
-        "oban_job_completion",
-        event_name: [:oban, :job, :stop],
-        measurement: :duration,
-        tags: [:worker],
-        tag_values: fn tags -> Map.put(tags, :worker, tags.job.worker) end,
-        unit: {:native, :second},
-        reporter_options: [
-          buckets: [0.01, 0.025, 0.05, 0.1, 0.2, 0.5, 1, 2.5, 5, 10]
-        ]
-      )
-    ]
-  end
-
-  defp summary_metrics do
-    [
-      # Phoenix Metrics
-      summary("phoenix.endpoint.stop.duration",
-        unit: {:native, :millisecond}
-      ),
-      summary("phoenix.router_dispatch.stop.duration",
-        tags: [:route],
-        unit: {:native, :millisecond}
-      ),
-      summary("pleroma.repo.query.total_time", unit: {:native, :millisecond}),
-      summary("pleroma.repo.query.decode_time", unit: {:native, :millisecond}),
-      summary("pleroma.repo.query.query_time", unit: {:native, :millisecond}),
-      summary("pleroma.repo.query.queue_time", unit: {:native, :millisecond}),
-      summary("pleroma.repo.query.idle_time", unit: {:native, :millisecond}),
-
-      # VM Metrics
-      summary("vm.memory.total", unit: {:byte, :kilobyte}),
-      summary("vm.total_run_queue_lengths.total"),
-      summary("vm.total_run_queue_lengths.cpu"),
-      summary("vm.total_run_queue_lengths.io"),
-      last_value("pleroma.local_users.total"),
-      last_value("pleroma.domains.total"),
-      last_value("pleroma.local_statuses.total"),
-      last_value("pleroma.remote_users.total")
-    ]
-  end
-
-  def prometheus_metrics, do: summary_metrics() ++ distribution_metrics()
-  def live_dashboard_metrics, do: summary_metrics()
-
-  defp periodic_measurements do
-    [
-      {__MODULE__, :instance_stats, []}
-    ]
-  end
-
-  def instance_stats do
-    stats = Stats.get_stats()
-    :telemetry.execute([:pleroma, :local_users], %{total: stats.user_count}, %{})
-    :telemetry.execute([:pleroma, :domains], %{total: stats.domain_count}, %{})
-    :telemetry.execute([:pleroma, :local_statuses], %{total: stats.status_count}, %{})
-    :telemetry.execute([:pleroma, :remote_users], %{total: stats.remote_user_count}, %{})
-  end
-end

lib/pleroma/web/templates/layout/app.html.eex

@@ -4,33 +4,17 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui">
     <title><%= Pleroma.Config.get([:instance, :name]) %></title>
-    <link rel="stylesheet" href="/static-fe/static-fe.css">
+    <link rel="stylesheet" href="/instance/static.css">
-    <link rel="stylesheet" href="/static-fe/forms.css">
   </head>
   <body>
-
+    <div class="instance-header">
-    <div class="background-image"></div>
+      <a class="instance-header__content" href="/">
-    <nav>
+        <img class="instance-header__thumbnail" src="<%= Pleroma.Config.get([:instance, :instance_thumbnail]) %>">
-      <div class="inner-nav">
+        <h1 class="instance-header__title"><%= Pleroma.Config.get([:instance, :name]) %></h1>
-        <a class="site-brand" href="/">
+      </a>
-          <img class="favicon" src="/favicon.png" />
+    </div>
-          <span><%= Pleroma.Config.get([:instance, :name]) %></span>
-        </a>
-      </div>
-    </nav>
     <div class="container">
-      <div class="underlay"></div>
+      <%= @inner_content %>
-      <div class="column main flex">
-        <div class="panel oauth">
-          <%= @inner_content %>
-        </div>
-      </div>
     </div>
   </body>
-
-  <style>
-  :root {
-    --background-image: url("<%= Pleroma.Config.get([:instance, :background_image]) %>");
-  }
-  </style>
 </html>

lib/pleroma/web/templates/layout/static_fe.html.eex

@@ -20,8 +20,8 @@
     </nav>
     <div class="container">
       <div class="underlay"></div>
-      <div class="column main">
+	  <div class="column main">
-          <%= @inner_content %>
+        <%= @inner_content %>
       </div>
       <div class="column sidebar">
         <div class="about panel">

lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex

@@ -1,29 +1,24 @@
-<div>
+<%= if get_flash(@conn, :info) do %>
-  <%= if get_flash(@conn, :info) do %>
+<p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
-  <p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
+<% end %>
-  <% end %>
+<%= if get_flash(@conn, :error) do %>
-  <%= if get_flash(@conn, :error) do %>
+<p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p>
-  <p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p>
+<% end %>
-  <% end %>
-  <div class="panel-heading">
-      <%= Gettext.dpgettext("static_pages", "mfa recover page title", "Two-factor recovery") %>
-  </div>
-  <div class="panel-content">
-      <%= form_for @conn, Routes.mfa_verify_path(@conn, :verify), [as: "mfa"], fn f -> %>
-      <div class="input">
-        <%= label f, :code, Gettext.dpgettext("static_pages", "mfa recover recovery code prompt", "Recovery code") %>
-        <%= text_input f, :code, [autocomplete: false, autocorrect: "off", autocapitalize: "off", autofocus: true, spellcheck: false] %>
-        <%= hidden_input f, :mfa_token, value: @mfa_token %>
-        <%= hidden_input f, :state, value: @state %>
-        <%= hidden_input f, :redirect_uri, value: @redirect_uri %>
-        <%= hidden_input f, :challenge_type, value: "recovery" %>
-      </div>
 
-      <%= submit Gettext.dpgettext("static_pages", "mfa recover verify recovery code button", "Verify") %>
+<h2><%= Gettext.dpgettext("static_pages", "mfa recover page title", "Two-factor recovery") %></h2>
-      <% end %>
-      <a href="<%= Routes.mfa_path(@conn, :show, %{challenge_type: "totp", mfa_token: @mfa_token, state: @state, redirect_uri: @redirect_uri}) %>">
-        <%= Gettext.dpgettext("static_pages", "mfa recover use 2fa code link", "Enter a two-factor code") %>
-      </a>
 
-  </div>
+<%= form_for @conn, Routes.mfa_verify_path(@conn, :verify), [as: "mfa"], fn f -> %>
+<div class="input">
+  <%= label f, :code, Gettext.dpgettext("static_pages", "mfa recover recovery code prompt", "Recovery code") %>
+  <%= text_input f, :code, [autocomplete: false, autocorrect: "off", autocapitalize: "off", autofocus: true, spellcheck: false] %>
+  <%= hidden_input f, :mfa_token, value: @mfa_token %>
+  <%= hidden_input f, :state, value: @state %>
+  <%= hidden_input f, :redirect_uri, value: @redirect_uri %>
+  <%= hidden_input f, :challenge_type, value: "recovery" %>
 </div>
+
+<%= submit Gettext.dpgettext("static_pages", "mfa recover verify recovery code button", "Verify") %>
+<% end %>
+<a href="<%= Routes.mfa_path(@conn, :show, %{challenge_type: "totp", mfa_token: @mfa_token, state: @state, redirect_uri: @redirect_uri}) %>">
+  <%= Gettext.dpgettext("static_pages", "mfa recover use 2fa code link", "Enter a two-factor code") %>
+</a>

lib/pleroma/web/templates/o_auth/mfa/totp.html.eex

@@ -1,28 +1,24 @@
-<div>
+<%= if get_flash(@conn, :info) do %>
-  <%= if get_flash(@conn, :info) do %>
+<p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
-  <p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
+<% end %>
-  <% end %>
+<%= if get_flash(@conn, :error) do %>
-  <%= if get_flash(@conn, :error) do %>
+<p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p>
-  <p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p>
+<% end %>
-  <% end %>
-  <div class="panel-heading">
-      <%= Gettext.dpgettext("static_pages", "mfa auth page title", "Two-factor authentication") %>
-  </div>
-  <div class="panel-content">
-      <%= form_for @conn, Routes.mfa_verify_path(@conn, :verify), [as: "mfa"], fn f -> %>
-      <div class="input">
-        <%= label f, :code, Gettext.dpgettext("static_pages", "mfa auth code prompt", "Authentication code") %>
-        <%= text_input f, :code, [autocomplete: "one-time-code", autocorrect: "off", autocapitalize: "off", autofocus: true, pattern: "[0-9]*", spellcheck: false] %>
-        <%= hidden_input f, :mfa_token, value: @mfa_token %>
-        <%= hidden_input f, :state, value: @state %>
-        <%= hidden_input f, :redirect_uri, value: @redirect_uri %>
-        <%= hidden_input f, :challenge_type, value: "totp" %>
-      </div>
 
-      <%= submit Gettext.dpgettext("static_pages", "mfa auth verify code button", "Verify") %>
+<h2><%= Gettext.dpgettext("static_pages", "mfa auth page title", "Two-factor authentication") %></h2>
-      <% end %>
+
-      <a href="<%= Routes.mfa_path(@conn, :show, %{challenge_type: "recovery", mfa_token: @mfa_token, state: @state, redirect_uri: @redirect_uri}) %>">
+<%= form_for @conn, Routes.mfa_verify_path(@conn, :verify), [as: "mfa"], fn f -> %>
-        <%= Gettext.dpgettext("static_pages", "mfa auth page use recovery code link", "Enter a two-factor recovery code") %>
+<div class="input">
-      </a>
+  <%= label f, :code, Gettext.dpgettext("static_pages", "mfa auth code prompt", "Authentication code") %>
-  </div>
+  <%= text_input f, :code, [autocomplete: "one-time-code", autocorrect: "off", autocapitalize: "off", autofocus: true, pattern: "[0-9]*", spellcheck: false] %>
+  <%= hidden_input f, :mfa_token, value: @mfa_token %>
+  <%= hidden_input f, :state, value: @state %>
+  <%= hidden_input f, :redirect_uri, value: @redirect_uri %>
+  <%= hidden_input f, :challenge_type, value: "totp" %>
 </div>
+
+<%= submit Gettext.dpgettext("static_pages", "mfa auth verify code button", "Verify") %>
+<% end %>
+<a href="<%= Routes.mfa_path(@conn, :show, %{challenge_type: "recovery", mfa_token: @mfa_token, state: @state, redirect_uri: @redirect_uri}) %>">
+  <%= Gettext.dpgettext("static_pages", "mfa auth page use recovery code link", "Enter a two-factor recovery code") %>
+</a>

lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex

@@ -1,8 +1,2 @@
-<div>
+<h1><%= Gettext.dpgettext("static_pages", "oauth authorized page title", "Successfully authorized") %></h1>
-    <div class="panel-heading">
+<h2><%= raw Gettext.dpgettext("static_pages", "oauth token code message", "Token code is <br>%{token}", token: safe_to_string(html_escape(@auth.token))) %></h2>
-        <%= Gettext.dpgettext("static_pages", "oauth authorized page title", "Successfully authorized") %>
-    </div>
-    <div class="panel-content">
-        <%= raw Gettext.dpgettext("static_pages", "oauth token code message", "Token code is <br>%{token}", token: safe_to_string(html_escape(@auth.token))) %>
-    </div>
-</div>

lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex

@@ -1,8 +1,2 @@
-<div>
+<h1><%= Gettext.dpgettext("static_pages", "oauth authorization exists page title", "Authorization exists") %></h1>
-    <div class="panel-heading">
+<h2><%= raw Gettext.dpgettext("static_pages", "oauth token code message", "Token code is <br>%{token}", token: safe_to_string(html_escape(@token.token))) %></h2>
-        <%= Gettext.dpgettext("static_pages", "oauth authorization exists page title", "Authorization exists") %>
-    </div>
-    <div class="panel-content">
-        <%= raw Gettext.dpgettext("static_pages", "oauth token code message", "Token code is <br>%{token}", token: safe_to_string(html_escape(@token.token))) %>
-    </div>
-</div>

lib/pleroma/web/templates/o_auth/o_auth/show.html.eex

@@ -10,56 +10,50 @@
 <%= if @user do %>
   <div class="account-header">
     <div class="account-header__banner" style="background-image: url('<%= Pleroma.User.banner_url(@user) %>')"></div>
-    <div class="account-header__avatar" style="background-image: url('<%= Pleroma.User.avatar_url(@user) %>')">
+    <div class="account-header__avatar" style="background-image: url('<%= Pleroma.User.avatar_url(@user) %>')"></div>
-      <div class="account-header__meta">
+    <div class="account-header__meta">
       <div class="account-header__display-name"><%= @user.name %></div>
       <div class="account-header__nickname">@<%= @user.nickname %>@<%= Pleroma.User.get_host(@user) %></div>
     </div>
-    </div>
-
   </div>
 <% end %>
 
 <div class="container__content">
   <%= if @app do %>
-    <div class="panel-heading">
+    <p><%= raw Gettext.dpgettext("static_pages", "oauth authorize message", "Application <strong>%{client_name}</strong> is requesting access to your account.", client_name: safe_to_string(html_escape(@app.client_name))) %></p>
-      <p><%= raw Gettext.dpgettext("static_pages", "oauth authorize message", "Application <strong>%{client_name}</strong> is requesting access to your account.", client_name: safe_to_string(html_escape(@app.client_name))) %></p>
+    <%= render @view_module, "_scopes.html", Map.merge(assigns, %{form: f}) %>
-    </div>
   <% end %>
 
-  <div class="panel-content">
+  <%= if @user do %>
-    <%= render @view_module, "_scopes.html", Map.merge(assigns, %{form: f}) %>
+    <div class="actions">
-    <%= if @user do %>
+      <a class="button button--cancel" href="/">
-      <div class="actions">
+        <%= Gettext.dpgettext("static_pages", "oauth authorize cancel button", "Cancel") %>
-        <a class="button button-cancel" href="/">
+      </a>
-          <%= Gettext.dpgettext("static_pages", "oauth authorize cancel button", "Cancel") %>
+      <%= submit Gettext.dpgettext("static_pages", "oauth authorize approve button", "Approve"), class: "button--approve" %>
-        </a>
+    </div>
-        <%= submit Gettext.dpgettext("static_pages", "oauth authorize approve button", "Approve"), class: "button--approve" %>
+  <% else %>
+    <%= if @params["registration"] in ["true", true] do %>
+      <h3><%= Gettext.dpgettext("static_pages", "oauth register page title", "This is the first time you visit! Please enter your Pleroma handle.") %></h3>
+      <p><%= Gettext.dpgettext("static_pages", "oauth register nickname unchangeable warning", "Choose carefully! You won't be able to change this later. You will be able to change your display name, though.") %></p>
+      <div class="input">
+        <%= label f, :nickname, Gettext.dpgettext("static_pages", "oauth register nickname prompt", "Pleroma Handle") %>
+        <%= text_input f, :nickname, placeholder: "lain", autocomplete: "username" %>
       </div>
+      <%= hidden_input f, :name, value: @params["name"] %>
+      <%= hidden_input f, :password, value: @params["password"] %>
+      <br>
     <% else %>
-      <%= if @params["registration"] in ["true", true] do %>
+      <div class="input">
-        <h3><%= Gettext.dpgettext("static_pages", "oauth register page title", "This is your first visit! Please enter your Akkoma handle.") %></h3>
+        <%= label f, :name, Gettext.dpgettext("static_pages", "oauth login username prompt", "Username") %>
-        <p><%= Gettext.dpgettext("static_pages", "oauth register nickname unchangeable warning", "Choose carefully! You won't be able to change this later. You will be able to change your display name, though.") %></p>
+        <%= text_input f, :name %>
-        <div class="input">
+      </div>
-          <%= label f, :nickname, Gettext.dpgettext("static_pages", "oauth register nickname prompt", "Pleroma Handle") %>
+      <div class="input">
-          <%= text_input f, :nickname, placeholder: "lain", autocomplete: "username" %>
+        <%= label f, :password, Gettext.dpgettext("static_pages", "oauth login password prompt", "Password") %>
-        </div>
+        <%= password_input f, :password %>
-        <%= hidden_input f, :name, value: @params["name"] %>
+      </div>
-        <%= hidden_input f, :password, value: @params["password"] %>
+      <%= submit Gettext.dpgettext("static_pages", "oauth login button", "Log In") %>
-        <br>
-      <% else %>
-        <div class="input">
-          <%= label f, :name, Gettext.dpgettext("static_pages", "oauth login username prompt", "Username") %>
-          <%= text_input f, :name %>
-        </div>
-        <div class="input">
-          <%= label f, :password, Gettext.dpgettext("static_pages", "oauth login password prompt", "Password") %>
-          <%= password_input f, :password %>
-        </div>
-        <%= submit Gettext.dpgettext("static_pages", "oauth login button", "Log In") %>
-      <% end %>
     <% end %>
-  </div>
+  <% end %>
 </div>
 
 <%= hidden_input f, :client_id, value: @client_id %>

mix.exs

@@ -143,7 +143,9 @@ defp deps do
       {:sweet_xml, "~> 0.7.2"},
       {:earmark, "~> 1.4.15"},
       {:bbcode_pleroma, "~> 0.2.0"},
-      {:argon2_elixir, "~> 3.0.0"},
+      {:crypt,
+       git: "https://github.com/msantos/crypt.git",
+       ref: "f75cd55325e33cbea198fb41fe41871392f8fb76"},
       {:cors_plug, "~> 2.0"},
       {:web_push_encryption, "~> 0.3.1"},
       {:swoosh, "~> 1.0"},
@@ -159,9 +161,6 @@ defp deps do
        git: "https://akkoma.dev/AkkomaGang/linkify.git", branch: "bugfix/line-ending-buffer"},
       {:http_signatures, "~> 0.1.1"},
       {:telemetry, "~> 0.3"},
-      {:telemetry_poller, "~> 0.4"},
-      {:telemetry_metrics, "~> 0.4"},
-      {:telemetry_metrics_prometheus_core, "~> 1.1.0"},
       {:poolboy, "~> 1.5"},
       {:recon, "~> 2.5"},
       {:joken, "~> 2.0"},

mix.lock

@@ -1,5 +1,4 @@
 %{
-  "argon2_elixir": {:hex, :argon2_elixir, "3.0.0", "fd4405f593e77b525a5c667282172dd32772d7c4fa58cdecdaae79d2713b6c5f", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "8b753b270af557d51ba13fcdebc0f0ab27a2a6792df72fd5a6cf9cfaffcedc57"},
   "base62": {:hex, :base62, "1.2.2", "85c6627eb609317b70f555294045895ffaaeb1758666ab9ef9ca38865b11e629", [:mix], [{:custom_base, "~> 0.2.1", [hex: :custom_base, repo: "hexpm", optional: false]}], "hexpm", "d41336bda8eaa5be197f1e4592400513ee60518e5b9f4dcf38f4b4dae6f377bb"},
   "bbcode_pleroma": {:hex, :bbcode_pleroma, "0.2.0", "d36f5bca6e2f62261c45be30fa9b92725c0655ad45c99025cb1c3e28e25803ef", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "19851074419a5fedb4ef49e1f01b30df504bb5dbb6d6adfc135238063bebd1c3"},
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "2.3.1", "5114d780459a04f2b4aeef52307de23de961b69e13a5cd98a911e39fda13f420", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "42182d5f46764def15bf9af83739e3bf4ad22661b1c34fc3e88558efced07279"},
@@ -19,6 +18,7 @@
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.3.1", "ebd1a1d7aff97f27c66654e78ece187abdc646992714164380d8a041eda16754", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a6efd3366130eab84ca372cbd4a7d3c3a97bdfcfb4911233b035d117063f0af"},
   "cowlib": {:hex, :cowlib, "2.11.0", "0b9ff9c346629256c42ebe1eeb769a83c6cb771a6ee5960bd110ab0b9b872063", [:make, :rebar3], [], "hexpm", "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9"},
   "credo": {:git, "https://github.com/rrrene/credo.git", "1c1b99ea41a457761383d81aaf6a606913996fe7", [ref: "1c1b99ea41a457761383d81aaf6a606913996fe7"]},
+  "crypt": {:git, "https://github.com/msantos/crypt.git", "f75cd55325e33cbea198fb41fe41871392f8fb76", [ref: "f75cd55325e33cbea198fb41fe41871392f8fb76"]},
   "custom_base": {:hex, :custom_base, "0.2.1", "4a832a42ea0552299d81652aa0b1f775d462175293e99dfbe4d7dbaab785a706", [:mix], [], "hexpm", "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"},
   "db_connection": {:hex, :db_connection, "2.4.3", "3b9aac9f27347ec65b271847e6baeb4443d8474289bd18c1d6f4de655b70c94d", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c127c15b0fa6cfb32eed07465e05da6c815b032508d4ed7c116122871df73c12"},
   "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
@@ -112,9 +112,6 @@
   "table_rex": {:hex, :table_rex, "3.1.1", "0c67164d1714b5e806d5067c1e96ff098ba7ae79413cc075973e17c38a587caa", [:mix], [], "hexpm", "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"},
   "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
-  "telemetry_metrics_prometheus": {:hex, :telemetry_metrics_prometheus, "1.1.0", "1cc23e932c1ef9aa3b91db257ead31ea58d53229d407e059b29bb962c1505a13", [:mix], [{:plug_cowboy, "~> 2.1", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:telemetry_metrics_prometheus_core, "~> 1.0", [hex: :telemetry_metrics_prometheus_core, repo: "hexpm", optional: false]}], "hexpm", "d43b3659b3244da44fe0275b717701542365d4519b79d9ce895b9719c1ce4d26"},
-  "telemetry_metrics_prometheus_core": {:hex, :telemetry_metrics_prometheus_core, "1.1.0", "4e15f6d7dbedb3a4e3aed2262b7e1407f166fcb9c30ca3f96635dfbbef99965c", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "0dd10e7fe8070095df063798f82709b0a1224c31b8baf6278b423898d591a069"},
-  "telemetry_poller": {:hex, :telemetry_poller, "0.5.1", "21071cc2e536810bac5628b935521ff3e28f0303e770951158c73eaaa01e962a", [:rebar3], [{:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4cab72069210bc6e7a080cec9afffad1b33370149ed5d379b81c7c5f0c663fd4"},
   "temple": {:git, "https://akkoma.dev/AkkomaGang/temple.git", "066a699ade472d8fa42a9d730b29a61af9bc8b59", [ref: "066a699ade472d8fa42a9d730b29a61af9bc8b59"]},
   "tesla": {:hex, :tesla, "1.4.4", "bb89aa0c9745190930366f6a2ac612cdf2d0e4d7fff449861baa7875afd797b2", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.3", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "d5503a49f9dec1b287567ea8712d085947e247cb11b06bc54adb05bfde466457"},
   "timex": {:hex, :timex, "3.7.9", "790cdfc4acfce434e442f98c02ea6d84d0239073bfd668968f82ac63e9a6788d", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "64691582e5bb87130f721fc709acfb70f24405833998fabf35be968984860ce1"},

priv/static/static-fe/forms.css

@@ -1,158 +0,0 @@
-form {
-    width: 100%;
-}
-
-.input {
-    color: var(--muted-text-color);
-    display: flex;
-    margin-left: 1em;
-    margin-right: 1em;
-    flex-direction: column;
-}
-
-input {
-    padding: 10px;
-    margin-top: 5px;
-    margin-bottom: 10px;
-    background-color: var(--background-color);
-    color: var(--primary-text-color);
-    border: 0;
-    transition-property: border-bottom;
-    transition-duration: 0.35s;
-    border-bottom: 2px solid #2a384a;
-    font-size: 14px;
-    width: inherit;
-    box-sizing: border-box;
-}
-
-.scopes-input {
-    display: flex;
-    flex-direction: column;
-    margin: 1em 0;
-    color: var(--muted-text-color);
-}
-
-.scopes-input label:first-child {
-    height: 2em;
-}
-
-.scopes {
-    display: flex;
-    flex-wrap: wrap;
-    color: var(--primary-text-color);
-}
-
-.scope {
-    display: flex;
-    flex-basis: 100%;
-    height: 2em;
-    align-items: center;
-}
-
-.scope:before {
-    color: var(--primary-text-color);
-    content: "✔\fe0e";
-    margin-left: 1em;
-    margin-right: 1em;
-}
-
-[type="checkbox"]+label {
-    display: none;
-    cursor: pointer;
-    margin: 0.5em;
-}
-
-[type="checkbox"] {
-    display: none;
-}
-
-[type="checkbox"]+label:before {
-    cursor: pointer;
-    display: inline-block;
-    color: white;
-    background-color: var(--background-color);
-    border: 4px solid var(--background-color);
-    box-shadow: 0px 0px 1px 0 var(--brand-color);
-    width: 1.2em;
-    height: 1.2em;
-    margin-right: 1.0em;
-    content: "";
-    transition-property: background-color;
-    transition-duration: 0.35s;
-    color: var(--background-color);
-    margin-bottom: -0.2em;
-    border-radius: 2px;
-}
-
-[type="checkbox"]:checked+label:before {
-    background-color: var(--brand-color);
-}
-
-a.button,
-button {
-    width: 100%;
-    background-color: #1c2a3a;
-    color: var(--primary-text-color);
-    border-radius: 4px;
-    border: none;
-    padding: 10px 16px;
-    margin-top: 20px;
-    margin-bottom: 20px;
-    text-transform: uppercase;
-    font-size: 16px;
-    box-shadow: 0px 0px 2px 0px black,
-        0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset,
-        0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
-}
-
-a.button:hover,
-button:hover {
-    cursor: pointer;
-    box-shadow: 0px 0px 0px 1px var(--brand-color),
-        0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset,
-        0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
-}
-
-.actions {
-    display: flex;
-    flex-grow: 1;
-}
-
-.actions button,
-.actions a.button {
-    width: auto;
-    margin-left: 2%;
-    width: 45%;
-    text-align: center;
-}
-
-.account-header__banner {
-    width: 100%;
-    height: 80px;
-    background-size: cover;
-    background-position: center;
-}
-
-.account-header__avatar {
-    width: 64px;
-    height: 64px;
-    background-size: cover;
-    background-position: center;
-    margin: -60px 10px 10px;
-    border: 6px solid var(--foreground-color);
-    border-radius: 999px;
-}
-
-.account-header__meta {
-    padding: 12px 20px 17px 70px;
-}
-
-.account-header__display-name {
-    font-size: 20px;
-    font-weight: bold;
-}
-
-.account-header__nickname {
-    font-size: 14px;
-    color: var(--muted-text-color);
-}

priv/static/static-fe/static-fe.css

@@ -11,14 +11,14 @@ :root {
     --profileTint: rgba(15, 22, 30, 0.5);
     --btnText: rgba(185, 185, 186, 1);
     --btn: rgba(21, 30, 43, 1);
-    --btnShadow: 0px 0px 2px 0px rgba(0, 0, 0, 1), 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
+    --btnShadow: 0px 0px 2px 0px rgba(0, 0, 0, 1) , 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
     --btnHoverShadow: 0px 0px 1px 2px rgba(185, 185, 186, 0.4) inset, 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
     --lightText: rgba(236, 236, 236, 1);
-    --panelShadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.5), 0px 4px 6px 3px rgba(0, 0, 0, 0.3);
+    --panelShadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.5) , 0px 4px 6px 3px rgba(0, 0, 0, 0.3);
-    --panelHeaderShadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.4), 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset;
+    --panelHeaderShadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.4) , 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset;
     --topBar: rgba(21, 30, 43, 1);
     --topBarText: rgba(159, 159, 161, 1);
-    --topBarShadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.4), 0px 2px 7px 0px rgba(0, 0, 0, 0.3);
+    --topBarShadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.4) , 0px 2px 7px 0px rgba(0, 0, 0, 0.3);
     --underlay: rgba(9, 14, 20, 0.6);
     --background: rgba(15, 22, 30, 1);
     --faint: rgba(185, 185, 186, 0.5);
@@ -28,11 +28,9 @@ :root {
     --border: rgba(26, 37, 53, 1);
     --poll: rgba(99, 84, 72, 1);
 }
-
 @media (prefers-color-scheme: light) {
     :root {
-        --icon-filter: invert(67%) sepia(7%) saturate(525%) hue-rotate(173deg) brightness(90%) contrast(92%);
+        --icon-filter: invert(67%) sepia(7%) saturate(525%) hue-rotate(173deg) brightness(90%) contrast(92%);;
-        ;
         --wallpaper: rgba(248, 250, 252, 1);
         --alertNeutral: rgba(48, 64, 85, 0.5);
         --alertNeutralText: rgba(0, 0, 0, 1);
@@ -43,10 +41,10 @@ @media (prefers-color-scheme: light) {
         --profileTint: rgba(242, 246, 249, 0.5);
         --btnText: rgba(48, 64, 85, 1);
         --btn: rgba(214, 223, 237, 1);
-        --btnShadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px 0px rgba(255, 255, 255, 0.5) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
+        --btnShadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.2) , 0px 1px 0px 0px rgba(255, 255, 255, 0.5) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
-        --btnHoverShadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.2), 0px 0px 1px 2px rgba(255, 195, 159, 1) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
+        --btnHoverShadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.2) , 0px 0px 1px 2px rgba(255, 195, 159, 1) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
         --lightText: rgba(11, 14, 19, 1);
-        --panelShadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.5), 0px 3px 6px 1px rgba(0, 0, 0, 0.2);
+        --panelShadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.5) , 0px 3px 6px 1px rgba(0, 0, 0, 0.2);
         --panelHeaderShadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.5) inset, 0px 1px 3px 0px rgba(0, 0, 0, 0.3);
         --topBar: rgba(214, 223, 237, 1);
         --topBarText: rgba(48, 64, 85, 1);
@@ -121,7 +119,7 @@ .inner-nav img {
     padding-right: 5px
 }
 
-body>.container {
+body > .container {
     display: grid;
     grid-template-columns: minmax(25em, 45em) 25em;
     grid-template-areas: "content sidebar";
@@ -157,10 +155,6 @@ .panel-heading {
     box-shadow: var(--panelHeaderShadow);
 }
 
-.panel-content {
-    padding: 1em;
-}
-
 .about-content {
     padding: 0.6em;
 }
@@ -175,18 +169,6 @@ .sidebar {
     padding-left: 0.5em;
 }
 
-.column.flex {
-    grid-column-end: sidebar-end;
-}
-
-.scopes-input {
-    display: flex;
-    flex-direction: column;
-    margin: 1em 0;
-    color: var(--muted-text-color);
-}
-
-
 .status-container,
 .repeat-header,
 .user-card {
@@ -211,7 +193,6 @@ .repeat-header {
 .repeat-header .right-side {
     color: var(--faint);
 }
-
 .repeat-header .u-photo {
     height: 20px;
     width: 20px;
@@ -274,7 +255,6 @@ .heading-reply-row {
 .reply-to-link {
     color: var(--faint);
 }
-
 .reply-to-link:hover {
     text-decoration: underline;
 }
@@ -300,13 +280,11 @@ .h-card {
     margin-bottom: 8px;
 }
 
-header a,
+header a, .h-card a {
-.h-card a {
     text-decoration: none;
 }
 
-header a:hover,
+header a:hover, .h-card a:hover {
-.h-card a:hover {
     text-decoration: underline;
 }
 
@@ -329,7 +307,7 @@ .attachment {
     min-width: 0;
 }
 
-.attachment>* {
+.attachment > * {
     width: 100%;
     object-fit: contain;
 }
@@ -344,7 +322,6 @@ .nsfw-banner {
     display: flex;
     align-items: center;
 }
-
 .nsfw-banner div {
     width: 100%;
     text-align: center;
@@ -353,7 +330,6 @@ .nsfw-banner div {
 .nsfw-banner:not(:hover) {
     background-color: var(--background);
 }
-
 .nsfw-banner:hover div {
     display: none;
 }
@@ -366,12 +342,10 @@ .poll-option {
     word-break: break-word;
     z-index: 1;
 }
-
 .poll-option .percentage {
     width: 3.5em;
     flex-shrink: 0;
 }
-
 .poll-option .fill {
     height: 100%;
     position: absolute;
@@ -388,8 +362,7 @@ .status-actions {
     display: flex;
     margin-top: 0.75em;
 }
-
+.status-actions > * {
-.status-actions>* {
     max-width: 4em;
     flex: 1;
     display: flex;
@@ -485,11 +458,11 @@ .user-banner {
     right: 0;
     bottom: 0;
     background-image: linear-gradient(to bottom, var(--profileTint), var(--profileTint)),
-        var(--user-banner);
+                      var(--user-banner);
     background-size: cover;
     background-color: var(--profileBg);
     -webkit-mask: linear-gradient(to top, white, transparent) bottom no-repeat,
-        linear-gradient(to top, white, white);
+                  linear-gradient(to top, white, white);
     -webkit-mask-composite: xor;
     -webkit-mask-size: 100% 60%;
     z-index: -2;
@@ -627,7 +600,7 @@ .reply-to-link .fa-icon {
 }
 
 @media (max-width: 800px) {
-    body>.container {
+    body > .container {
         display: block;
     }
 
@@ -651,4 +624,4 @@ img:not(.u-photo, .fa-icon) {
 .username img:not(.u-photo) {
     width: 16px;
     height: 16px;
-}
+}

scripts/create_metrics_app.sh

@@ -1,65 +0,0 @@
-#!/bin/sh
-
-read -p "Instance URL (e.g https://example.com): " INSTANCE_URL
-
-echo "Creating oauth app..."
-
-RESP=$(curl \
-    -XPOST \
-    $INSTANCE_URL/api/v1/apps \
-    --silent \
-    --data-urlencode 'client_name=fedibash' \
-    --data-urlencode 'redirect_uris=urn:ietf:wg:oauth:2.0:oob' \
-    --data-urlencode 'scopes=admin:metrics' \
-    --header "Content-Type: application/x-www-form-urlencoded"
-)
-
-client_id=$(echo $RESP | jq -r .client_id)
-client_secret=$(echo $RESP | jq -r .client_secret)
-
-if [ -z "$client_id" ]; then
-  echo "Could not create an app"
-  echo "$RESP"
-  exit 1
-fi
-
-echo "Please visit the following URL and input the code provided"
-AUTH_URL="$INSTANCE_URL/oauth/authorize?client_id=$client_id&redirect_uri=urn:ietf:wg:oauth:2.0:oob&scope=admin:metrics&response_type=code"
-if [ ! -z "$BROWSER" ]; then
-  $BROWSER $AUTH_URL
-fi;
-
-echo $AUTH_URL
-
-read -p "Code: " CODE
-
-echo "Requesting code..."
-
-RESP=$(curl \
-    -XPOST \
-    $INSTANCE_URL/oauth/token \
-    --silent \
-    --header "Content-Type: application/x-www-form-urlencoded" \
-    --data-urlencode "client_id=$client_id" \
-    --data-urlencode "client_secret=$client_secret" \
-    --data-urlencode "code=$CODE" \
-    --data-urlencode "grant_type=authorization_code" \
-    --data-urlencode 'redirect_uri=urn:ietf:wg:oauth:2.0:oob' \
-    --data-urlencode "scope=admin:metrics"
-)
-echo $RESP
-ACCESS_TOKEN="$(echo $RESP | jq -r .access_token)"
-
-echo "Token is $ACCESS_TOKEN"
-DOMAIN=$(echo $INSTANCE_URL | sed -e 's/^https:\/\///')
-
-echo "Use the following config in your prometheus.yml:
-- job_name: akkoma
-  scheme: https
-  authorization:
-    credentials: $ACCESS_TOKEN
-  metrics_path: /api/v1/akkoma/metrics
-  static_configs:
-  - targets:
-    - $DOMAIN
-"

test/pleroma/akkoma/translators/argos_translate_test.exs

@@ -1,93 +0,0 @@
-defmodule Pleroma.Akkoma.Translators.ArgosTranslateTest do
-  alias Pleroma.Akkoma.Translators.ArgosTranslate
-
-  import Mock
-
-  use Pleroma.DataCase, async: true
-
-  setup do
-    clear_config([:argos_translate, :command_argos_translate], "argos-translate_test")
-    clear_config([:argos_translate, :command_argospm], "argospm_test")
-  end
-
-  test "it lists available languages" do
-    languages =
-      with_mock System, [:passthrough],
-        cmd: fn "argospm_test", ["list"], _ ->
-          {"translate-nl_en\ntranslate-en_nl\ntranslate-ja_en\n", 0}
-        end do
-        ArgosTranslate.languages()
-      end
-
-    assert {:ok, source_langs, dest_langs} = languages
-
-    assert [%{code: "en", name: "en"}, %{code: "ja", name: "ja"}, %{code: "nl", name: "nl"}] =
-             source_langs |> Enum.sort()
-
-    assert [%{code: "en", name: "en"}, %{code: "nl", name: "nl"}] = dest_langs |> Enum.sort()
-  end
-
-  test "it translates from the to language when no language is set and returns the text unchanged" do
-    assert {:ok, "nl", "blabla"} = ArgosTranslate.translate("blabla", nil, "nl")
-  end
-
-  test "it translates from the provided language if provided" do
-    translation_response =
-      with_mock System, [:passthrough],
-        cmd: fn "argos-translate_test", ["--from-lang", "nl", "--to-lang", "en", "blabla"], _ ->
-          {"yadayada", 0}
-        end do
-        ArgosTranslate.translate("blabla", "nl", "en")
-      end
-
-    assert {:ok, "nl", "yadayada"} = translation_response
-  end
-
-  test "it returns a proper error when the executable can't be found" do
-    non_existing_command = "sfqsfgqsefd"
-    clear_config([:argos_translate, :command_argos_translate], non_existing_command)
-    clear_config([:argos_translate, :command_argospm], non_existing_command)
-
-    assert nil == System.find_executable(non_existing_command)
-
-    assert {:error, "ArgosTranslate failed to fetch languages" <> _} = ArgosTranslate.languages()
-
-    assert {:error, "ArgosTranslate failed to translate" <> _} =
-             ArgosTranslate.translate("blabla", "nl", "en")
-  end
-
-  test "it can strip html" do
-    content =
-      ~s[<p>What&#39;s up my fellow fedizens?</p><p>So anyway</p><ul><li><a class="hashtag" data-tag="cofe" href="https://suya.space/tag/cofe">#cofe</a></li><li><a class="hashtag" data-tag="suya" href="https://cofe.space/tag/suya">#Suya</a></li></ul><p>ammiright!<br/>:ablobfoxhyper:</p>]
-
-    stripped_content =
-      "\nWhat's up my fellow fedizens?\n\nSo anyway\n\n#cofe\n#Suya\nammiright!\n:ablobfoxhyper:\n"
-
-    expected_response_strip_html =
-      "<br/>What&#39;s up my fellow fedizens?<br/><br/>So anyway<br/><br/>#cofe<br/>#Suya<br/>ammiright!<br/>:ablobfoxhyper:<br/>"
-
-    response_strip_html =
-      with_mock System, [:passthrough],
-        cmd: fn "argos-translate_test",
-                ["--from-lang", _, "--to-lang", _, ^stripped_content],
-                _ ->
-          {stripped_content, 0}
-        end do
-        ArgosTranslate.translate(content, "nl", "en")
-      end
-
-    clear_config([:argos_translate, :strip_html], false)
-
-    response_no_strip_html =
-      with_mock System, [:passthrough],
-        cmd: fn "argos-translate_test", ["--from-lang", _, "--to-lang", _, string], _ ->
-          {string, 0}
-        end do
-        ArgosTranslate.translate(content, "nl", "en")
-      end
-
-    assert {:ok, "nl", content} == response_no_strip_html
-
-    assert {:ok, "nl", expected_response_strip_html} == response_strip_html
-  end
-end

test/pleroma/config_db_test.exs

@@ -227,10 +227,6 @@ test "pleroma module" do
       assert ConfigDB.to_elixir_types("Pleroma.Bookmark") == Pleroma.Bookmark
     end
 
-    test "removed module" do
-      assert ConfigDB.to_elixir_types("Pleroma.Nowhere") == :invalid_atom
-    end
-
     test "pleroma string" do
       assert ConfigDB.to_elixir_types("Pleroma") == "Pleroma"
     end

test/pleroma/emoji/pack_test.exs

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Emoji.PackTest do
-  use Pleroma.DataCase, async: false
+  use Pleroma.DataCase
   alias Pleroma.Emoji.Pack
 
   @emoji_path Path.join(

test/pleroma/http/adapter_helper_test.exs

@@ -66,11 +66,4 @@ test "receive_timeout should be overridden by :http, :receive_timeout" do
       assert options[:receive_timeout] == 20_000
     end
   end
-
-  describe "pool size settings" do
-    test "should get set" do
-      options = AdapterHelper.add_pool_size([], 50)
-      assert options[:pools][:default][:size] == 50
-    end
-  end
 end

test/pleroma/mfa_test.exs

@@ -30,8 +30,8 @@ test "returns backup codes" do
       {:ok, [code1, code2]} = MFA.generate_backup_codes(user)
       updated_user = refresh_record(user)
       [hash1, hash2] = updated_user.multi_factor_authentication_settings.backup_codes
-      assert Pleroma.Password.checkpw(code1, hash1)
+      assert Pleroma.Password.Pbkdf2.verify_pass(code1, hash1)
-      assert Pleroma.Password.checkpw(code2, hash2)
+      assert Pleroma.Password.Pbkdf2.verify_pass(code2, hash2)
     end
   end
 

test/pleroma/password_test.exs

@@ -1,65 +0,0 @@
-defmodule Pleroma.PasswordTest do
-  use Pleroma.DataCase, async: true
-  import Pleroma.Factory
-  import ExUnit.CaptureLog
-
-  alias Pleroma.Password
-
-  describe "hash_pwd_salt/1" do
-    test "returns a hash" do
-      assert "$argon2id" <> _ = Password.hash_pwd_salt("test")
-    end
-  end
-
-  describe "maybe_update_password/2" do
-    test "with a bcrypt hash, it updates to an argon2 hash" do
-      user = insert(:user, password_hash: Bcrypt.hash_pwd_salt("123"))
-      assert "$2" <> _ = user.password_hash
-
-      {:ok, user} = Password.maybe_update_password(user, "123")
-      assert "$argon2" <> _ = user.password_hash
-    end
-
-    test "with a pbkdf2 hash, it updates to an argon2 hash" do
-      user = insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("123"))
-      assert "$pbkdf2" <> _ = user.password_hash
-
-      {:ok, user} = Password.maybe_update_password(user, "123")
-      assert "$argon2" <> _ = user.password_hash
-    end
-  end
-
-  describe "checkpw/2" do
-    test "check pbkdf2 hash" do
-      hash =
-        "$pbkdf2-sha512$160000$loXqbp8GYls43F0i6lEfIw$AY.Ep.2pGe57j2hAPY635sI/6w7l9Q9u9Bp02PkPmF3OrClDtJAI8bCiivPr53OKMF7ph6iHhN68Rom5nEfC2A"
-
-      assert Password.checkpw("test-password", hash)
-      refute Password.checkpw("test-password1", hash)
-    end
-
-    test "check bcrypt hash" do
-      hash = "$2a$10$uyhC/R/zoE1ndwwCtMusK.TLVzkQ/Ugsbqp3uXI.CTTz0gBw.24jS"
-
-      assert Password.checkpw("password", hash)
-      refute Password.checkpw("password1", hash)
-    end
-
-    test "check argon2 hash" do
-      hash =
-        "$argon2id$v=19$m=65536,t=8,p=2$zEMMsTuK5KkL5AFWbX7jyQ$VyaQD7PF6e9btz0oH1YiAkWwIGZ7WNDZP8l+a/O171g"
-
-      assert Password.checkpw("password", hash)
-      refute Password.checkpw("password1", hash)
-    end
-
-    test "it returns false when hash invalid" do
-      hash =
-        "psBWV8gxkGOZWBz$PmfCycChoxeJ3GgGzwvhlgacb9mUoZ.KUXNCssekER4SJ7bOK53uXrHNb2e4i8yPFgSKyzaW9CcmrDXWIEMtD1"
-
-      assert capture_log(fn ->
-               refute Password.checkpw("password", hash)
-             end) =~ "[error] Password hash not recognized"
-    end
-  end
-end

test/pleroma/web/akkoma_api/metrics_controller_test.exs

@@ -1,35 +0,0 @@
-defmodule Pleroma.Web.AkkomaAPI.MetricsControllerTest do
-  use Pleroma.Web.ConnCase, async: true
-
-  describe "GET /api/v1/akkoma/metrics" do
-    test "should return metrics when the user has admin:metrics" do
-      %{conn: conn} = oauth_access(["admin:metrics"])
-
-      Pleroma.PrometheusExporter.gather()
-
-      resp =
-        conn
-        |> get("/api/v1/akkoma/metrics")
-        |> text_response(200)
-
-      assert resp =~ "# HELP"
-    end
-
-    test "should not allow users that do not have the admin:metrics scope" do
-      %{conn: conn} = oauth_access(["read:metrics"])
-
-      conn
-      |> get("/api/v1/akkoma/metrics")
-      |> json_response(403)
-    end
-
-    test "should be disabled by export_prometheus_metrics" do
-      clear_config([:instance, :export_prometheus_metrics], false)
-      %{conn: conn} = oauth_access(["admin:metrics"])
-
-      conn
-      |> get("/api/v1/akkoma/metrics")
-      |> response(404)
-    end
-  end
-end

test/pleroma/web/auth/basic_auth_test.exs

@@ -11,7 +11,7 @@ test "with HTTP Basic Auth used, grants access to OAuth scope-restricted endpoin
     conn: conn
   } do
     user = insert(:user)
-    assert Pleroma.Password.checkpw("test", user.password_hash)
+    assert Pleroma.Password.Pbkdf2.verify_pass("test", user.password_hash)
 
     basic_auth_contents =
       (URI.encode_www_form(user.nickname) <> ":" <> URI.encode_www_form("test"))

test/pleroma/web/auth/pleroma_authenticator_test.exs

@@ -15,7 +15,7 @@ defmodule Pleroma.Web.Auth.PleromaAuthenticatorTest do
     user =
       insert(:user,
         nickname: name,
-        password_hash: Pleroma.Password.hash_pwd_salt(password)
+        password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password)
       )
 
     {:ok, [user: user, name: name, password: password]}
@@ -30,7 +30,7 @@ test "get_user/authorization", %{name: name, password: password} do
 
     assert {:ok, returned_user} = res
     assert returned_user.id == user.id
-    assert "$argon2" <> _ = returned_user.password_hash
+    assert "$pbkdf2" <> _ = returned_user.password_hash
   end
 
   test "get_user/authorization with invalid password", %{name: name} do

test/pleroma/web/auth/totp_authenticator_test.exs

@@ -34,7 +34,7 @@ test "checks backup codes" do
 
     hashed_codes =
       backup_codes
-      |> Enum.map(&Pleroma.Password.hash_pwd_salt(&1))
+      |> Enum.map(&Pleroma.Password.Pbkdf2.hash_pwd_salt(&1))
 
     user =
       insert(:user,

test/pleroma/web/feed/user_controller_test.exs

@@ -184,15 +184,14 @@ test "with html format, it redirects to user feed", %{conn: conn} do
       note_activity = insert(:note_activity)
       user = User.get_cached_by_ap_id(note_activity.data["actor"])
 
-      %{assigns: %{csp_nonce: nonce}} = resp_conn = get(conn, "/users/#{user.nickname}")
-
       response =
-        resp_conn
+        conn
+        |> get("/users/#{user.nickname}")
         |> response(200)
 
       assert response ==
                Pleroma.Web.Fallback.RedirectController.redirector_with_meta(
-                 assign(conn, :csp_nonce, nonce),
+                 conn,
                  %{user: user}
                ).resp_body
     end

test/pleroma/web/mastodon_api/controllers/account_controller_test.exs

@@ -1919,50 +1919,6 @@ test "account lookup", %{conn: conn} do
       |> json_response_and_validate_schema(404)
   end
 
-  test "account lookup with restrict unauthenticated profiles for local" do
-    clear_config([:restrict_unauthenticated, :profiles, :local], true)
-
-    user = insert(:user, local: true)
-    reading_user = insert(:user)
-
-    conn =
-      build_conn()
-      |> get("/api/v1/accounts/lookup?acct=#{user.nickname}")
-
-    assert json_response_and_validate_schema(conn, 401)
-
-    conn =
-      build_conn()
-      |> assign(:user, reading_user)
-      |> assign(:token, insert(:oauth_token, user: reading_user, scopes: ["read:accounts"]))
-      |> get("/api/v1/accounts/lookup?acct=#{user.nickname}")
-
-    assert %{"id" => id} = json_response_and_validate_schema(conn, 200)
-    assert id == user.id
-  end
-
-  test "account lookup with restrict unauthenticated profiles for remote" do
-    clear_config([:restrict_unauthenticated, :profiles, :remote], true)
-
-    user = insert(:user, nickname: "user@example.com", local: false)
-    reading_user = insert(:user)
-
-    conn =
-      build_conn()
-      |> get("/api/v1/accounts/lookup?acct=#{user.nickname}")
-
-    assert json_response_and_validate_schema(conn, 401)
-
-    conn =
-      build_conn()
-      |> assign(:user, reading_user)
-      |> assign(:token, insert(:oauth_token, user: reading_user, scopes: ["read:accounts"]))
-      |> get("/api/v1/accounts/lookup?acct=#{user.nickname}")
-
-    assert %{"id" => id} = json_response_and_validate_schema(conn, 200)
-    assert id == user.id
-  end
-
   test "create a note on a user" do
     %{conn: conn} = oauth_access(["write:accounts", "read:follows"])
     other_user = insert(:user)

test/pleroma/web/mastodon_api/controllers/status_controller_test.exs

@@ -326,7 +326,7 @@ test "posting a fake status", %{conn: conn} do
     test "fake statuses' preview card is not cached", %{conn: conn} do
       clear_config([:rich_media, :enabled], true)
 
-      Tesla.Mock.mock_global(fn
+      Tesla.Mock.mock(fn
         %{
           method: :get,
           url: "https://example.com/twitter-card"
@@ -2023,7 +2023,6 @@ test "posting a quote", %{conn: conn} do
       assert response["quote_id"] == quoted_status.id
       assert response["quote"]["id"] == quoted_status.id
       assert response["quote"]["content"] == quoted_status.object.data["content"]
-      assert response["pleroma"]["context"] == quoted_status.data["context"]
     end
 
     test "posting a quote, quoting a status that isn't public", %{conn: conn} do

test/pleroma/web/mastodon_api/controllers/tag_controller_test.exs

@@ -94,66 +94,4 @@ test "should 404 if hashtag doesn't exist" do
       assert response["error"] == "Hashtag not found"
     end
   end
-
-  describe "GET /api/v1/followed_tags" do
-    test "should list followed tags" do
-      %{user: user, conn: conn} = oauth_access(["read:follows"])
-
-      response =
-        conn
-        |> get("/api/v1/followed_tags")
-        |> json_response_and_validate_schema(200)
-
-      assert Enum.empty?(response)
-
-      hashtag = insert(:hashtag, name: "jubjub")
-      {:ok, _user} = User.follow_hashtag(user, hashtag)
-
-      response =
-        conn
-        |> get("/api/v1/followed_tags")
-        |> json_response_and_validate_schema(200)
-
-      assert [%{"name" => "jubjub"}] = response
-    end
-
-    test "should include a link header to paginate" do
-      %{user: user, conn: conn} = oauth_access(["read:follows"])
-
-      for i <- 1..21 do
-        hashtag = insert(:hashtag, name: "jubjub#{i}}")
-        {:ok, _user} = User.follow_hashtag(user, hashtag)
-      end
-
-      response =
-        conn
-        |> get("/api/v1/followed_tags")
-
-      json = json_response_and_validate_schema(response, 200)
-      assert Enum.count(json) == 20
-      assert [link_header] = get_resp_header(response, "link")
-      assert link_header =~ "rel=\"next\""
-      next_link = extract_next_link_header(link_header)
-
-      response =
-        conn
-        |> get(next_link)
-        |> json_response_and_validate_schema(200)
-
-      assert Enum.count(response) == 1
-    end
-
-    test "should refuse access without read:follows scope" do
-      %{conn: conn} = oauth_access(["write"])
-
-      conn
-      |> get("/api/v1/followed_tags")
-      |> json_response_and_validate_schema(403)
-    end
-  end
-
-  defp extract_next_link_header(header) do
-    [_, next_link] = Regex.run(~r{<(?<next_link>.*)>; rel="next"}, header)
-    next_link
-  end
 end

test/pleroma/web/mastodon_api/update_credentials_test.exs

@@ -465,69 +465,6 @@ test "update fields", %{conn: conn} do
              ]
     end
 
-    test "update fields with a link to content with rel=me, with ap id", %{user: user, conn: conn} do
-      Tesla.Mock.mock(fn
-        %{url: "http://example.com/rel_me/ap_id"} ->
-          %Tesla.Env{
-            status: 200,
-            body: ~s[<html><head><link rel="me" href="#{user.ap_id}"></head></html>]
-          }
-      end)
-
-      field = %{name: "Website", value: "http://example.com/rel_me/ap_id"}
-
-      account_data =
-        conn
-        |> patch("/api/v1/accounts/update_credentials", %{fields_attributes: [field]})
-        |> json_response_and_validate_schema(200)
-
-      assert [
-               %{
-                 "name" => "Website",
-                 "value" =>
-                   ~s[<a href="http://example.com/rel_me/ap_id" rel="ugc">http://example.com/rel_me/ap_id</a>],
-                 "verified_at" => verified_at
-               }
-             ] = account_data["fields"]
-
-      {:ok, verified_at, _} = DateTime.from_iso8601(verified_at)
-      assert DateTime.diff(DateTime.utc_now(), verified_at) < 10
-    end
-
-    test "update fields with a link to content with rel=me, with frontend path", %{
-      user: user,
-      conn: conn
-    } do
-      fe_url = "#{Pleroma.Web.Endpoint.url()}/#{user.nickname}"
-
-      Tesla.Mock.mock(fn
-        %{url: "http://example.com/rel_me/fe_path"} ->
-          %Tesla.Env{
-            status: 200,
-            body: ~s[<html><head><link rel="me" href="#{fe_url}"></head></html>]
-          }
-      end)
-
-      field = %{name: "Website", value: "http://example.com/rel_me/fe_path"}
-
-      account_data =
-        conn
-        |> patch("/api/v1/accounts/update_credentials", %{fields_attributes: [field]})
-        |> json_response_and_validate_schema(200)
-
-      assert [
-               %{
-                 "name" => "Website",
-                 "value" =>
-                   ~s[<a href="http://example.com/rel_me/fe_path" rel="ugc">http://example.com/rel_me/fe_path</a>],
-                 "verified_at" => verified_at
-               }
-             ] = account_data["fields"]
-
-      {:ok, verified_at, _} = DateTime.from_iso8601(verified_at)
-      assert DateTime.diff(DateTime.utc_now(), verified_at) < 10
-    end
-
     test "emojis in fields labels", %{conn: conn} do
       fields = [
         %{name: ":firefox:", value: "is best 2hu"},

test/pleroma/web/mongoose_im_controller_test.exs

@@ -41,13 +41,13 @@ test "/user_exists", %{conn: conn} do
   end
 
   test "/check_password", %{conn: conn} do
-    user = insert(:user, password_hash: Pleroma.Password.hash_pwd_salt("cool"))
+    user = insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("cool"))
 
     _deactivated_user =
       insert(:user,
         nickname: "konata",
         is_active: false,
-        password_hash: Pleroma.Password.hash_pwd_salt("cool")
+        password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("cool")
       )
 
     res =

test/pleroma/web/o_auth/ldap_authorization_test.exs

@@ -18,7 +18,7 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
   @tag @skip
   test "authorizes the existing user using LDAP credentials" do
     password = "testpassword"
-    user = insert(:user, password_hash: Pleroma.Password.hash_pwd_salt(password))
+    user = insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
     app = insert(:oauth_app, scopes: ["read", "write"])
 
     host = Pleroma.Config.get([:ldap, :host]) |> to_charlist
@@ -101,7 +101,7 @@ test "creates a new user after successful LDAP authorization" do
   @tag @skip
   test "disallow authorization for wrong LDAP credentials" do
     password = "testpassword"
-    user = insert(:user, password_hash: Pleroma.Password.hash_pwd_salt(password))
+    user = insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
     app = insert(:oauth_app, scopes: ["read", "write"])
 
     host = Pleroma.Config.get([:ldap, :host]) |> to_charlist

test/pleroma/web/o_auth/mfa_controller_test.exs

@@ -20,7 +20,7 @@ defmodule Pleroma.Web.OAuth.MFAControllerTest do
       insert(:user,
         multi_factor_authentication_settings: %MFA.Settings{
           enabled: true,
-          backup_codes: [Pleroma.Password.hash_pwd_salt("test-code")],
+          backup_codes: [Pleroma.Password.Pbkdf2.hash_pwd_salt("test-code")],
           totp: %MFA.Settings.TOTP{secret: otp_secret, confirmed: true}
         }
       )
@@ -246,7 +246,7 @@ test "returns access token with valid code", %{conn: conn, app: app} do
 
       hashed_codes =
         backup_codes
-        |> Enum.map(&Pleroma.Password.hash_pwd_salt(&1))
+        |> Enum.map(&Pleroma.Password.Pbkdf2.hash_pwd_salt(&1))
 
       user =
         insert(:user,

test/pleroma/web/o_auth/o_auth_controller_test.exs

@@ -316,7 +316,7 @@ test "with valid params, POST /oauth/register?op=connect redirects to `redirect_
            app: app,
            conn: conn
          } do
-      user = insert(:user, password_hash: Pleroma.Password.hash_pwd_salt("testpassword"))
+      user = insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("testpassword"))
       registration = insert(:registration, user: nil)
       redirect_uri = OAuthController.default_redirect_uri(app)
 
@@ -347,7 +347,7 @@ test "with unlisted `redirect_uri`, POST /oauth/register?op=connect results in H
            app: app,
            conn: conn
          } do
-      user = insert(:user, password_hash: Pleroma.Password.hash_pwd_salt("testpassword"))
+      user = insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("testpassword"))
       registration = insert(:registration, user: nil)
       unlisted_redirect_uri = "http://cross-site-request.com"
 
@@ -693,76 +693,45 @@ test "with existing authentication and OOB `redirect_uri`, redirects to app with
 
   describe "POST /oauth/authorize" do
     test "redirects with oauth authorization, " <>
-           "granting requested app-supported scopes to admin users" do
+           "granting requested app-supported scopes to both admin- and non-admin users" do
       app_scopes = ["read", "write", "admin", "secret_scope"]
       app = insert(:oauth_app, scopes: app_scopes)
       redirect_uri = OAuthController.default_redirect_uri(app)
-      scopes_subset = ["read:subscope", "write", "admin"]
-      admin = insert(:user, is_admin: true)
-
-      # In case scope param is missing, expecting _all_ app-supported scopes to be granted
-      conn =
-        post(
-          build_conn(),
-          "/oauth/authorize",
-          %{
-            "authorization" => %{
-              "name" => admin.nickname,
-              "password" => "test",
-              "client_id" => app.client_id,
-              "redirect_uri" => redirect_uri,
-              "scope" => scopes_subset,
-              "state" => "statepassed"
-            }
-          }
-        )
-
-      target = redirected_to(conn)
-      assert target =~ redirect_uri
-
-      query = URI.parse(target).query |> URI.query_decoder() |> Map.new()
-
-      assert %{"state" => "statepassed", "code" => code} = query
-      auth = Repo.get_by(Authorization, token: code)
-      assert auth
-      assert auth.scopes == scopes_subset
-    end
-
-    test "redirects with oauth authorization, " <>
-           "granting requested app-supported scopes for non-admin users" do
-      app_scopes = ["read", "write", "secret_scope", "admin"]
-      app = insert(:oauth_app, scopes: app_scopes)
-      redirect_uri = OAuthController.default_redirect_uri(app)
 
       non_admin = insert(:user, is_admin: false)
-      scopes_subset = ["read:subscope", "write", "admin", "admin:metrics"]
+      admin = insert(:user, is_admin: true)
+      scopes_subset = ["read:subscope", "write", "admin"]
 
       # In case scope param is missing, expecting _all_ app-supported scopes to be granted
-      conn =
+      for user <- [non_admin, admin],
-        post(
+          {requested_scopes, expected_scopes} <-
-          build_conn(),
+            %{scopes_subset => scopes_subset, nil: app_scopes} do
-          "/oauth/authorize",
+        conn =
-          %{
+          post(
-            "authorization" => %{
+            build_conn(),
-              "name" => non_admin.nickname,
+            "/oauth/authorize",
-              "password" => "test",
+            %{
-              "client_id" => app.client_id,
+              "authorization" => %{
-              "redirect_uri" => redirect_uri,
+                "name" => user.nickname,
-              "scope" => scopes_subset,
+                "password" => "test",
-              "state" => "statepassed"
+                "client_id" => app.client_id,
+                "redirect_uri" => redirect_uri,
+                "scope" => requested_scopes,
+                "state" => "statepassed"
+              }
             }
-          }
+          )
-        )
 
-      target = redirected_to(conn)
+        target = redirected_to(conn)
-      assert target =~ redirect_uri
+        assert target =~ redirect_uri
 
-      query = URI.parse(target).query |> URI.query_decoder() |> Map.new()
+        query = URI.parse(target).query |> URI.query_decoder() |> Map.new()
 
-      assert %{"state" => "statepassed", "code" => code} = query
+        assert %{"state" => "statepassed", "code" => code} = query
-      auth = Repo.get_by(Authorization, token: code)
+        auth = Repo.get_by(Authorization, token: code)
-      assert auth
+        assert auth
-      assert auth.scopes == ["read:subscope", "write"]
+        assert auth.scopes == expected_scopes
+      end
     end
 
     test "authorize from cookie" do
@@ -862,6 +831,33 @@ test "returns 401 for wrong credentials", %{conn: conn} do
       assert result =~ "Invalid Username/Password"
     end
 
+    test "returns 401 for missing scopes" do
+      user = insert(:user, is_admin: false)
+      app = insert(:oauth_app, scopes: ["read", "write", "admin"])
+      redirect_uri = OAuthController.default_redirect_uri(app)
+
+      result =
+        build_conn()
+        |> post("/oauth/authorize", %{
+          "authorization" => %{
+            "name" => user.nickname,
+            "password" => "test",
+            "client_id" => app.client_id,
+            "redirect_uri" => redirect_uri,
+            "state" => "statepassed",
+            "scope" => ""
+          }
+        })
+        |> html_response(:unauthorized)
+
+      # Keep the details
+      assert result =~ app.client_id
+      assert result =~ redirect_uri
+
+      # Error message
+      assert result =~ "This action is outside the authorized scopes"
+    end
+
     test "returns 401 for scopes beyond app scopes hierarchy", %{conn: conn} do
       user = insert(:user)
       app = insert(:oauth_app, scopes: ["read", "write"])
@@ -886,7 +882,7 @@ test "returns 401 for scopes beyond app scopes hierarchy", %{conn: conn} do
       assert result =~ redirect_uri
 
       # Error message
-      assert result =~ "This action is outside of authorized scopes"
+      assert result =~ "This action is outside the authorized scopes"
     end
   end
 
@@ -917,7 +913,7 @@ test "issues a token for an all-body request" do
 
     test "issues a token for `password` grant_type with valid credentials, with full permissions by default" do
       password = "testpassword"
-      user = insert(:user, password_hash: Pleroma.Password.hash_pwd_salt(password))
+      user = insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
 
       app = insert(:oauth_app, scopes: ["read", "write"])
 
@@ -947,7 +943,7 @@ test "issues a mfa token for `password` grant_type, when MFA enabled" do
 
       user =
         insert(:user,
-          password_hash: Pleroma.Password.hash_pwd_salt(password),
+          password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
           multi_factor_authentication_settings: %MFA.Settings{
             enabled: true,
             totp: %MFA.Settings.TOTP{secret: otp_secret, confirmed: true}
@@ -1056,7 +1052,7 @@ test "rejects token exchange for valid credentials belonging to unconfirmed user
       password = "testpassword"
 
       {:ok, user} =
-        insert(:user, password_hash: Pleroma.Password.hash_pwd_salt(password))
+        insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
         |> User.confirmation_changeset(set_confirmation: false)
         |> User.update_and_set_cache()
 
@@ -1084,7 +1080,7 @@ test "rejects token exchange for valid credentials belonging to deactivated user
 
       user =
         insert(:user,
-          password_hash: Pleroma.Password.hash_pwd_salt(password),
+          password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
           is_active: false
         )
 
@@ -1112,7 +1108,7 @@ test "rejects token exchange for user with password_reset_pending set to true" d
 
       user =
         insert(:user,
-          password_hash: Pleroma.Password.hash_pwd_salt(password),
+          password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
           password_reset_pending: true
         )
 
@@ -1141,7 +1137,7 @@ test "rejects token exchange for user with confirmation_pending set to true" do
 
       user =
         insert(:user,
-          password_hash: Pleroma.Password.hash_pwd_salt(password),
+          password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
           is_confirmed: false
         )
 
@@ -1169,7 +1165,7 @@ test "rejects token exchange for valid credentials belonging to an unapproved us
 
       user =
         insert(:user,
-          password_hash: Pleroma.Password.hash_pwd_salt(password),
+          password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
           is_approved: false
         )
 

test/pleroma/web/plugs/authentication_plug_test.exs

@@ -17,7 +17,7 @@ defmodule Pleroma.Web.Plugs.AuthenticationPlugTest do
     user = %User{
       id: 1,
       name: "dude",
-      password_hash: Pleroma.Password.hash_pwd_salt("guy")
+      password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("guy")
     }
 
     conn =
@@ -52,7 +52,7 @@ test "with a correct password in the credentials, " <>
     assert PlugHelper.plug_skipped?(conn, OAuthScopesPlug)
   end
 
-  test "with a bcrypt hash, it updates to an argon2 hash", %{conn: conn} do
+  test "with a bcrypt hash, it updates to a pkbdf2 hash", %{conn: conn} do
     user = insert(:user, password_hash: Bcrypt.hash_pwd_salt("123"))
     assert "$2" <> _ = user.password_hash
 
@@ -67,17 +67,21 @@ test "with a bcrypt hash, it updates to an argon2 hash", %{conn: conn} do
     assert PlugHelper.plug_skipped?(conn, OAuthScopesPlug)
 
     user = User.get_by_id(user.id)
-    assert "$argon2" <> _ = user.password_hash
+    assert "$pbkdf2" <> _ = user.password_hash
   end
 
-  test "with a pbkdf2 hash, it updates to an argon2 hash", %{conn: conn} do
+  @tag :skip_on_mac
-    user = insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("123"))
+  test "with a crypt hash, it updates to a pkbdf2 hash", %{conn: conn} do
-    assert "$pbkdf2" <> _ = user.password_hash
+    user =
+      insert(:user,
+        password_hash:
+          "$6$9psBWV8gxkGOZWBz$PmfCycChoxeJ3GgGzwvhlgacb9mUoZ.KUXNCssekER4SJ7bOK53uXrHNb2e4i8yPFgSKyzaW9CcmrDXWIEMtD1"
+      )
 
     conn =
       conn
       |> assign(:auth_user, user)
-      |> assign(:auth_credentials, %{password: "123"})
+      |> assign(:auth_credentials, %{password: "password"})
       |> AuthenticationPlug.call(%{})
 
     assert conn.assigns.user.id == conn.assigns.auth_user.id
@@ -85,7 +89,7 @@ test "with a pbkdf2 hash, it updates to an argon2 hash", %{conn: conn} do
     assert PlugHelper.plug_skipped?(conn, OAuthScopesPlug)
 
     user = User.get_by_id(user.id)
-    assert "$argon2" <> _ = user.password_hash
+    assert "$pbkdf2" <> _ = user.password_hash
   end
 
   describe "checkpw/2" do
@@ -97,16 +101,16 @@ test "check pbkdf2 hash" do
       refute AuthenticationPlug.checkpw("test-password1", hash)
     end
 
-    test "check bcrypt hash" do
+    @tag :skip_on_mac
-      hash = "$2a$10$uyhC/R/zoE1ndwwCtMusK.TLVzkQ/Ugsbqp3uXI.CTTz0gBw.24jS"
+    test "check sha512-crypt hash" do
+      hash =
+        "$6$9psBWV8gxkGOZWBz$PmfCycChoxeJ3GgGzwvhlgacb9mUoZ.KUXNCssekER4SJ7bOK53uXrHNb2e4i8yPFgSKyzaW9CcmrDXWIEMtD1"
 
       assert AuthenticationPlug.checkpw("password", hash)
-      refute AuthenticationPlug.checkpw("password1", hash)
     end
 
-    test "check argon2 hash" do
+    test "check bcrypt hash" do
-      hash =
+      hash = "$2a$10$uyhC/R/zoE1ndwwCtMusK.TLVzkQ/Ugsbqp3uXI.CTTz0gBw.24jS"
-        "$argon2id$v=19$m=65536,t=8,p=2$zEMMsTuK5KkL5AFWbX7jyQ$VyaQD7PF6e9btz0oH1YiAkWwIGZ7WNDZP8l+a/O171g"
 
       assert AuthenticationPlug.checkpw("password", hash)
       refute AuthenticationPlug.checkpw("password1", hash)