Update roundcube carddav plugin to support roundcube 1.5 and close a security hole

tests/lib/carddav.sh

@@ -240,14 +240,26 @@ roundcube_force_carddav_refresh() {
     local pass="$2"
     local assets_dir="${ASSETS_DIR:-tests/assets}"
     local code
-    if [ ! -e "$RCM_DIR/bin/carddav_refresh.sh" ]; then
-        echo "Please ignore the following errors about no such table carddav_addressbooks and carddav_migrations"
+
+    local carddav_major
+    local sync_script
+    carddav_major=$(grep "PLUGIN_VERSION\\s*=" "$RCM_DIR/plugins/carddav/carddav.php" | head -1 | sed -e 's/^.*v\([0-9][0-9]*\).*$/\1/')
+    [ -z "$carddav_major" ] && carddav_major="3"
+
+    if [ $carddav_major -eq 3 ]; then
+        if [ ! -e "$RCM_DIR/bin/carddav_refresh.sh" ]; then
+            echo "Please ignore the following errors about no such table carddav_addressbooks and carddav_migrations"
+        fi
+        sync_script="$assets_dir/mail/roundcube/carddav_refresh_v3.sh"
+    else
+        sync_script="$assets_dir/mail/roundcube/carddav_refresh.sh"
     fi
 
-    if ! cp "$assets_dir/mail/roundcube/carddav_refresh.sh" $RCM_DIR/bin
+    if ! cp "$sync_script" "$RCM_DIR/bin/carddav_refresh.sh"
     then
         return 1
     fi
+    
     pushd "$RCM_DIR" >/dev/null
     bin/carddav_refresh.sh "$user" "$pass"
     code=$?

tests/system-setup/populate/basic-verify.sh

@@ -24,9 +24,11 @@ echo "[Force Roundcube contact sync]" 1>&2
 # contacts for it will be removed in the Roundcube database after the
 # sync
 
-if ! roundcube_force_carddav_refresh "$TEST_USER" "$TEST_USER_PASS" 1>&2
+roundcube_force_carddav_refresh "$TEST_USER" "$TEST_USER_PASS" 1>&2
+rc=$?
+if [ $rc -ne 0 ]
 then
-    echo "Roundcube <-> Nextcloud contact sync failed ($?)"
+    echo "Roundcube <-> Nextcloud contact sync failed ($rc)"
     exit 1
 fi