From f51f6fd9bc42fd71ecfa68a1ceefe65ec3eaea64 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 29 Apr 2024 15:01:11 +0200
Subject: [PATCH] Update to 2024-04-29 15:01

---
 roles/kimai/defaults/main.yml                     |  6 +++---
 roles/kimai/files/kimai_empty_authorization.patch | 11 +++++++++++
 roles/kimai/tasks/install.yml                     |  6 ++++++
 roles/kimai/templates/httpd.conf.j2               |  2 +-
 roles/kimai/vars/RedHat-8.yml                     |  1 +
 roles/kimai/vars/RedHat-9.yml                     |  1 +
 6 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 roles/kimai/files/kimai_empty_authorization.patch

diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml
index 06315b5..5c59d7a 100644
--- a/roles/kimai/defaults/main.yml
+++ b/roles/kimai/defaults/main.yml
@@ -5,12 +5,12 @@
 # You can set it to a number or a simple string (no special chars)
 kimai_id: 1
 # Kimai version to deploy
-kimai_version: '2.13.0'
+kimai_version: '2.15.0'
 
 # URL of the archive
 kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz
 # Expected sha256 of the archive
-kimai_archive_sha256: 4b5136fc12e00a6591088bfbdbeed2b0e07002d15918204a67e0878b96bf32d6
+kimai_archive_sha256: f61c50d3d426922bc6533768ccfa51b428b82506c8fbade4534ff0daf6ccd334
 # Directory where kimai will be installed
 kimai_root_dir: /opt/kimai_{{ kimai_id }}
 # Should ansible handle upgrades or only initial install
@@ -20,7 +20,7 @@ kimai_manage_upgrade: True
 # Will be created
 kimai_php_user: php-kimai_{{ kimai_id }}
 # PHP version under which kimai will run
-kimai_php_version: 82
+kimai_php_version: 83
 # Or you can specify here the name of a custom PHP FPM pool. See the httpd_php role
 # bookstack_php_fpm_pool: custom_kimai
 
diff --git a/roles/kimai/files/kimai_empty_authorization.patch b/roles/kimai/files/kimai_empty_authorization.patch
new file mode 100644
index 0000000..3d5c388
--- /dev/null
+++ b/roles/kimai/files/kimai_empty_authorization.patch
@@ -0,0 +1,11 @@
+--- src/API/Authentication/ApiRequestMatcher.php.orig	2024-04-29 13:28:50.876284724 +0200
++++ src/API/Authentication/ApiRequestMatcher.php	2024-04-29 13:29:14.366580152 +0200
+@@ -27,7 +27,7 @@
+         }
+ 
+         // let's use this firewall if a Bearer token is set in the header
+-        if ($request->headers->has('Authorization')) {
++        if ($request->headers->has('Authorization') && $request->headers->get('Authorization') != "") {
+             return true;
+ 	}
+ 
diff --git a/roles/kimai/tasks/install.yml b/roles/kimai/tasks/install.yml
index e5461f0..54b215e 100644
--- a/roles/kimai/tasks/install.yml
+++ b/roles/kimai/tasks/install.yml
@@ -59,6 +59,12 @@
       environment:
         COMPOSER_ALLOW_SUPERUSER: 1
 
+    - name: Fix empty Authorization header
+      patch:
+        src: kimai_empty_authorization.patch
+        dest: "{{ kimai_root_dir }}/app/src/API/Authentication/ApiRequestMatcher.php"
+        backup: true
+
   tags: kimai
 
 - import_tasks: ../includes/webapps_create_mysql_db.yml
diff --git a/roles/kimai/templates/httpd.conf.j2 b/roles/kimai/templates/httpd.conf.j2
index 2a7f4d3..e6b0d7c 100644
--- a/roles/kimai/templates/httpd.conf.j2
+++ b/roles/kimai/templates/httpd.conf.j2
@@ -26,6 +26,6 @@ Alias /{{ kimai_web_alias | regex_replace('^/','') }} {{ kimai_root_dir }}/app/p
 
 </Directory>
 
-<Directory {{ kimai_root_dir }}/public/bundles>
+<Directory {{ kimai_root_dir }}/app/public/bundles>
   FallbackResource disabled
 </Directory>
diff --git a/roles/kimai/vars/RedHat-8.yml b/roles/kimai/vars/RedHat-8.yml
index 70e647e..7bf2463 100644
--- a/roles/kimai/vars/RedHat-8.yml
+++ b/roles/kimai/vars/RedHat-8.yml
@@ -7,3 +7,4 @@ kimai_packages:
   - acl
   - zstd
   - git
+  - patch
diff --git a/roles/kimai/vars/RedHat-9.yml b/roles/kimai/vars/RedHat-9.yml
index 70e647e..7bf2463 100644
--- a/roles/kimai/vars/RedHat-9.yml
+++ b/roles/kimai/vars/RedHat-9.yml
@@ -7,3 +7,4 @@ kimai_packages:
   - acl
   - zstd
   - git
+  - patch