HOTFIX: workaround for davrods bug

See UtrechtUniversity/davrods#19
cyverse · Feb 14, 2024 · 42b39f7 · 42b39f7
1 parent be20c77
commit 42b39f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/irods/tests/webdav.yml b/irods/tests/webdav.yml
@@ -186,6 +186,7 @@
       with_items:
         - /etc/httpd
         - /tmp/cert
+        - /tmp/key
 
     - name: Test place TLS certificate files
       ansible.builtin.stat:
@@ -195,6 +196,7 @@
       with_items:
         - /etc/httpd/testing.crt
         - /tmp/cert/testing.crt
+        - /tmp/key/testing.key
 
     - name: Retrieve TLS certificate chain file contents
       ansible.builtin.slurp:
@@ -257,7 +259,7 @@
           -----END CERTIFICATE-----
           '
 
-    - name: Test place TLS key
+    - name: Verify TLS key contents
       ansible.builtin.debug:
         msg: TODO implement
 

diff --git a/irods/webdav.yml b/irods/webdav.yml
@@ -72,6 +72,13 @@
 
               UseCanonicalName On
 
+              # XXX - Workaround for https://github.com/UtrechtUniversity/davrods/issues/19
+              <If "%{REQUEST_METHOD} == 'PROPFIND'">
+                SetOutputFilter Sed
+                OutputSed "s,\([^:]\)//,\1/,g"
+              </If>
+              # XXX - ^^^
+
               # Redirect dav-anon to dav
               <LocationMatch "/dav-anon/{{ _irods_zone_name }}/((commons/(community_released|cyverse_curated)|home|projects)(/.*)?)" >
                 Require expr %{REQUEST_URI} !~ m#^/dav-anon/{{ _irods_zone_name }}/home(/[^/]*/?)?$#

diff --git a/testing/ansible-tester/inventory/group_vars/webdav.yml b/testing/ansible-tester/inventory/group_vars/webdav.yml
@@ -8,6 +8,7 @@ webdav_purgeman_irods_password: password
 
 webdav_tls_chain: "{{ tls_root_cert }}"
 webdav_tls_chain_file: /etc/httpd/testing.crt
-webdav_tls_key_file: "{{ webdav_tls_cert_file }}"
 webdav_tls_cert: "{{ tls_cert_default }}"
 webdav_tls_cert_file: /tmp/cert/testing.crt
+webdav_tls_key: "{{ tls_key_default }}"
+webdav_tls_key_file: /tmp/key/testing.key