Merge pull request #226 from YunoHost-Apps/testing

Testing - 2024.02.14~ynh2

README.md

@@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Shipped version:** 2024.02.14~ynh1
+**Shipped version:** 2024.02.16~ynh1
 ## Disclaimers / important information
 
 ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk!

README_fr.md

@@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais).
 
 
-**Version incluse :** 2024.02.14~ynh1
+**Version incluse :** 2024.02.16~ynh1
 ## Avertissements / informations importantes
 
 Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs).

conf/app.src

@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/e7ca82762dbcbf3d304437a91778f377e6739980.tar.gz
+SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/c0279385d70202bb3ee2b7e277e558ec1245cc7a.tar.gz
-SOURCE_SUM=04f3078c7c3cf7b24a3137550f467c8ed580355abf4ede061f1ae2c3079b3cae
+SOURCE_SUM=18a1c5ac55c83e76b303d1af0894b03e20f684f7fff1b7dda12d889bc7a85a01
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=e7ca82762dbcbf3d304437a91778f377e6739980.tar.gz
+SOURCE_FILENAME=c0279385d70202bb3ee2b7e277e558ec1245cc7a.tar.gz
 SOURCE_EXTRACT=true

manifest.json

@@ -6,7 +6,7 @@
         "en": "Libre and federated social network, fork of Mastodon",
         "fr": "Réseau social libre et fédéré, scission de Mastodon"
     },
-    "version": "2024.02.14~ynh1",
+    "version": "2024.02.16~ynh1",
     "url": "https://github.com/glitch-soc/mastodon",
     "upstream": {
         "license": "AGPL-3.0-or-later",

sources/patches/app-disable-registration.patch

@@ -1,13 +0,0 @@
-diff --git a/config/settings.yml b/config/settings.yml
-index 094209822..2e2a5147d 100644
---- a/config/settings.yml
-+++ b/config/settings.yml
-@@ -9,7 +9,7 @@ defaults: &defaults
-   site_terms: ''
-   site_contact_username: ''
-   site_contact_email: ''
--  registrations_mode: 'open'
-+  registrations_mode: 'none'
-   profile_directory: true
-   closed_registrations_message: ''
-   open_deletion: true

sources/patches/app-sso.patch

@@ -1,57 +0,0 @@
-diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
-index 7c36bc6b8..3f691d102 100644
---- a/app/controllers/application_controller.rb
-+++ b/app/controllers/application_controller.rb
-@@ -68,7 +68,7 @@ class ApplicationController < ActionController::Base
-     if ENV['OMNIAUTH_ONLY'] == 'true' && ENV['OIDC_ENABLED'] == 'true'
-       '/auth/auth/openid_connect/logout'
-     else
--      new_user_session_path
-+      "https://#{File.read('/etc/yunohost/current_host')}/yunohost/sso/?action=logout"
-     end
-   end
-
-   def pack(data, pack_name, skin = 'default')
-diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
-index 5232e6cfd..160348674 100644
---- a/config/initializers/devise.rb
-+++ b/config/initializers/devise.rb
-@@ -180,7 +180,7 @@ Devise.setup do |config|
-   # given strategies, for example, `config.http_authenticatable = [:database]` will
-   # enable it only for database authentication. The supported strategies are:
-   # :database      = Support basic authentication with authentication key + password
--  config.http_authenticatable = [:pam, :database]
-+  config.http_authenticatable = [:two_factor_ldap, :pam, :database]
- 
-   # If 401 status code should be returned for AJAX requests. True by default.
-   # config.http_authenticatable_on_xhr = true
-diff --git a/lib/devise/two_factor_ldap_authenticatable.rb b/lib/devise/two_factor_ldap_authenticatable.rb
-index 065aa2de8..0eb4be10c 100644
---- a/lib/devise/two_factor_ldap_authenticatable.rb
-+++ b/lib/devise/two_factor_ldap_authenticatable.rb
-@@ -5,13 +5,13 @@ require 'devise/strategies/base'
- 
- module Devise
-   module Strategies
--    class TwoFactorLdapAuthenticatable < Base
-+    class TwoFactorLdapAuthenticatable < Authenticatable
-       def valid?
--        valid_params? && mapping.to.respond_to?(:authenticate_with_ldap)
-+        (valid_for_params_auth? || valid_for_http_auth?) && mapping.to.respond_to?(:authenticate_with_ldap)
-       end
- 
-       def authenticate!
--        resource = mapping.to.authenticate_with_ldap(params[scope])
-+        resource = mapping.to.authenticate_with_ldap(authentication_hash.merge(:password => password))
- 
-         if resource && !resource.otp_required_for_login?
-           success!(resource)
-@@ -23,7 +23,7 @@ module Devise
-       protected
- 
-       def valid_params?
--        params[scope] && params[scope][:password].present?
-+        super && params[scope][:password].present?
-       end
-     end
-   end