From 4d5cd24cbb33635ee38b8312e7fcfe289488aa29 Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs Date: Thu, 12 Nov 2026 13:43:12 +0200 Subject: [PATCH 1/3] 71349-bunny-cdn -added upload to bunny cdn -added cleanup logic --- client/build.gradle.kts | 71 ++++++++++++--- scripts/maven_clean.sh | 196 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 12 deletions(-) create mode 100644 scripts/maven_clean.sh diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 262a81a..53d806a 100755 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -48,7 +48,16 @@ if (project.hasProperty("regulaforensicsMavenUser")) { val regulaforensicsMavenPassword: String by project val regulaforensicsMavenUser: String by project + val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" + val type = when { + version.toString().contains("beta", ignoreCase = true) -> "Beta" + version.toString().contains("nightly", ignoreCase = true) -> "Nightly" + version.toString().contains("rc", ignoreCase = true) -> "RC" + else -> "" + } + + val finalUrl = uri("sftp://maven-master.regulaforensics.com:22/FaceSDKWebClient/$type") publishing { publications { create("client") { @@ -58,25 +67,63 @@ if (project.hasProperty("regulaforensicsMavenUser")) { } repositories { maven { - - val releasesRepoUrl = uri("sftp://maven-master.regulaforensics.com:22/FaceSDKWebClient") - val rcRepoUrl = uri("sftp://maven-master.regulaforensics.com:22/FaceSDKWebClient/RC") - val nightlyRepoUrl = uri("sftp://maven-master.regulaforensics.com:22/FaceSDKWebClient/Nightly") - - val resultRepoUrl = if(version.toString().contains("nightly")) nightlyRepoUrl - else if(version.toString().contains("rc")) rcRepoUrl - else releasesRepoUrl - - println("Version: $version repoUrl: $resultRepoUrl") - name = "regulaforensics" version = version.toString().split('-')[0] - url = resultRepoUrl + url = finalUrl credentials { username = regulaforensicsMavenUser password = regulaforensicsMavenPassword } } + + maven { + name = "BunnyCDN" + url = + uri("https://storage.bunnycdn.com/maven-production-regulaforensics-sz/RegulaDocumentReaderWebClient/$type/") + + credentials(HttpHeaderCredentials::class) { + this.name = "AccessKey" + this.value = bunnyCreds + } + + authentication { + create("header") + } + } + } + } + + tasks.register("runMavenClean") { + val typeParam = (project.findProperty("Type") as? String) ?: "" + val regulaforensicsMavenPassword: String by project + val regulaforensicsMavenUser: String by project + val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" + val scriptDir = project.rootProject.file("scripts") + + doLast { + if (typeParam.isNotEmpty() && + regulaforensicsMavenUser.isNotEmpty() && + regulaforensicsMavenPassword.isNotEmpty() && + bunnyCreds.isNotEmpty() + ) { + println("Conditions met, executing maven_clean.sh") + + project.exec { + workingDir = scriptDir + commandLine( + "bash", + "maven_clean.sh", + typeParam, + regulaforensicsMavenUser, + regulaforensicsMavenPassword, + bunnyCreds + ) + } + + } else { + println("Skipping execution: Some parameters are missing.") + } } } } + diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh new file mode 100644 index 0000000..05febf3 --- /dev/null +++ b/scripts/maven_clean.sh @@ -0,0 +1,196 @@ +#!/bin/bash + +#1 - type (Release, Temp, Beta, Nightly or Stage) +#2 - package for remove (RegulaDocumentReaderGit/com/regula/documentreader/api or com/regula/face/core/basic) + +TYPE=$1 +LOGIN=$2 +PASSW=$3 +BUNNY_CREDS=$4 +DELETE_OLDER=15 +PACKAGE="com/regula/facerecognition/webclient/" + +# Protect Release builds +if [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "release" ]; then + echo "Release packages cannot be cleaned." + exit 0 +elif [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "nightly" ]; then + TYPE="Nightly" +elif [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "rc" ]; then + TYPE="RC" +elif [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "beta" ]; then + TYPE="Beta" +fi + +# --- Server Environments --- + FTP_HOST="maven-master.regulaforensics.com" + FTP_USER="$LOGIN" + FTP_PASS="$PASSW" + FTP_BASE_URL="https://maven-master.regulaforensics.com/FaceRecognitionWebClient/$TYPE" + FTP_PATH="FaceRecognitionWebClient/$TYPE/$PACKAGE" + +BUNNY_BASE_URL="https://storage.bunnycdn.com/maven-production-regulaforensics-sz/FaceRecognitionWebClient/${TYPE}/${PACKAGE}" + + +# --- Update XML & Generate Hashes --- +update_metadata_and_hashes() { + local version="$1" + local file="maven-metadata.xml" + local date_str=$(date '+%Y%m%d%H%M%S') + + if [ ! -f "$file" ]; then + echo "Error: $file does not exist for update." + return 1 + fi + + # Update XML metadata + xmlstarlet ed --inplace \ + --delete "/metadata/versioning/versions/version[contains(text(),'$version')]" \ + --var dateValue "'$date_str'" \ + --update '/metadata/versioning/latest' \ + --expr '/metadata/versioning/versions/version[last()]/text()' \ + --update '/metadata/versioning/release' \ + --expr '/metadata/versioning/versions/version[last()]/text()' \ + --update '/metadata/versioning/lastUpdated' \ + --expr '$dateValue' \ + "$file" + + # Generate checksums + md5sum "$file" > "$file.md5" + + openssl dgst -sha1 -out "$file.sha1" "$file" + sed -i 's/SHA1(maven-metadata.xml)= //g' "$file.sha1" + + openssl dgst -sha256 -out "$file.sha256" "$file" + sed -i 's/SHA2-256(maven-metadata.xml)= //g' "$file.sha256" + + openssl dgst -sha512 -out "$file.sha512" "$file" + sed -i 's/SHA2-512(maven-metadata.xml)= //g' "$file.sha512" +} + + + +# FTP: Deletes via lftp and updates FTP maven-metadata +delete_ftp_version() { + local version="$1" + echo " [FTP] Updating metadata and deleting version: $version" + + local temp_work_dir=$(mktemp -d) + cd "$temp_work_dir" || return + + # Download current metadata from FTP + wget -q "$FTP_BASE_URL/$PACKAGE/maven-metadata.xml" -O maven-metadata.xml + + if [ -f maven-metadata.xml ]; then + update_metadata_and_hashes "$version" + + # Delete directory & re-upload updated metadata + lftp -u "$FTP_USER,$FTP_PASS" "$FTP_HOST" << EOF +cd $FTP_PATH +mrm $version/* +rmdir $version +mput maven-metadata.* +bye +EOF + echo " [FTP] Successfully cleaned version $version." + else + echo " [FTP] Warning: Could not download maven-metadata.xml from FTP." + fi + + cd - > /dev/null || return + rm -rf "$temp_work_dir" +} + +# Bunny CDN : Deletes via HTTP REST API and updates Bunny maven-metadata +delete_bunny_version() { + local version="$1" + echo " [Bunny CDN] Updating metadata and deleting version: $version" + + local temp_work_dir=$(mktemp -d) + cd "$temp_work_dir" || return + + # Download current metadata from Bunny CDN + curl -sS -X GET "$BUNNY_BASE_URL/maven-metadata.xml" \ + -H "AccessKey: $BUNNY_CREDS" \ + -o maven-metadata.xml + + if [ -f maven-metadata.xml ] && [ -s maven-metadata.xml ]; then + update_metadata_and_hashes "$version" + + # 1. Delete directory via Bunny API + curl -sS -X DELETE "$BUNNY_BASE_URL/$version/" \ + -H "AccessKey: $BUNNY_CREDS" > /dev/null + + # 2. Upload updated metadata files to Bunny CDN + for ext in "" ".md5" ".sha1" ".sha256" ".sha512"; do + local file_to_upload="maven-metadata.xml${ext}" + if [ -f "$file_to_upload" ]; then + curl -sS -X PUT "$BUNNY_BASE_URL/$file_to_upload" \ + -H "AccessKey: $BUNNY_CREDS" \ + --data-binary "@$file_to_upload" > /dev/null + fi + done + echo " [Bunny CDN] Successfully cleaned version $version." + else + echo " [Bunny CDN] Warning: Could not fetch valid maven-metadata.xml from Bunny CDN." + fi + + cd - > /dev/null || return + rm -rf "$temp_work_dir" +} + + +# --- Search and Trigger Logic --- + +process_ftp_storage() { + echo "=== Processing FTP Storage ===" + lftp -c "open -u '$FTP_USER,$FTP_PASS' '$FTP_HOST'; cd '$FTP_PATH'; ls -l" | while read -r line; do + if [[ $line == d* ]]; then + local date_str=$(echo "$line" | awk '{print $6, $7, $8}') + local version=$(echo "$line" | awk '{print $9}') + + local folder_date=$(date -d "$date_str" +%s 2>/dev/null) + local current_date=$(date +%s) + + if [ -n "$folder_date" ]; then + local age=$(( (current_date - folder_date) / 86400 )) + echo "FTP Version: $version | Age: $age days" + + if [ "$age" -gt "$DELETE_OLDER" ]; then + delete_ftp_version "$version" + fi + fi + fi + done +} + +process_bunny_storage() { + echo "=== Processing Bunny CDN Storage ===" + + local response=$(curl -sS -X GET "$BUNNY_BASE_URL/" \ + -H "AccessKey: $BUNNY_CREDS" \ + -H "Accept: application/json") + + echo "$response" | jq -r '.[]? | select(.IsDirectory == true) | "\(.ObjectName)\t\(.LastChanged)"' \ + | while IFS=$'\t' read -r version last_changed; do + if [ -n "$version" ]; then + local iso_date=$(echo "$last_changed" | cut -d'T' -f1) + local folder_date=$(date -d "$iso_date" +%s 2>/dev/null) + local current_date=$(date +%s) + + if [ -n "$folder_date" ]; then + local age=$(( (current_date - folder_date) / 86400 )) + echo "Bunny Version: $version | Age: $age days" + + if [ "$age" -gt "$DELETE_OLDER" ]; then + delete_bunny_version "$version" + fi + fi + fi + done +} + + +# --- Execution --- +process_ftp_storage +process_bunny_storage \ No newline at end of file From 7152caac661e3b73aa942199875b2343ca344f2a Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Thu, 12 Nov 2026 13:52:31 +0200 Subject: [PATCH 2/3] Fix -proper paths -mock deletion for safety --- client/build.gradle.kts | 2 +- scripts/maven_clean.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 53d806a..7804450 100755 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -79,7 +79,7 @@ if (project.hasProperty("regulaforensicsMavenUser")) { maven { name = "BunnyCDN" url = - uri("https://storage.bunnycdn.com/maven-production-regulaforensics-sz/RegulaDocumentReaderWebClient/$type/") + uri("https://storage.bunnycdn.com/maven-production-regulaforensics-sz/FaceSDKWebClient/$type/") credentials(HttpHeaderCredentials::class) { this.name = "AccessKey" diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh index 05febf3..c5849af 100644 --- a/scripts/maven_clean.sh +++ b/scripts/maven_clean.sh @@ -8,7 +8,7 @@ LOGIN=$2 PASSW=$3 BUNNY_CREDS=$4 DELETE_OLDER=15 -PACKAGE="com/regula/facerecognition/webclient/" +PACKAGE="com/regula/facesdk/webclient" # Protect Release builds if [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "release" ]; then @@ -26,10 +26,10 @@ fi FTP_HOST="maven-master.regulaforensics.com" FTP_USER="$LOGIN" FTP_PASS="$PASSW" - FTP_BASE_URL="https://maven-master.regulaforensics.com/FaceRecognitionWebClient/$TYPE" - FTP_PATH="FaceRecognitionWebClient/$TYPE/$PACKAGE" + FTP_BASE_URL="https://maven-master.regulaforensics.com/FaceSDKWebClient/$TYPE" + FTP_PATH="FaceSDKWebClient/$TYPE/$PACKAGE" -BUNNY_BASE_URL="https://storage.bunnycdn.com/maven-production-regulaforensics-sz/FaceRecognitionWebClient/${TYPE}/${PACKAGE}" +BUNNY_BASE_URL="https://storage.bunnycdn.com/maven-production-regulaforensics-sz/FaceSDKWebClient/${TYPE}/${PACKAGE}" # --- Update XML & Generate Hashes --- @@ -157,7 +157,7 @@ process_ftp_storage() { echo "FTP Version: $version | Age: $age days" if [ "$age" -gt "$DELETE_OLDER" ]; then - delete_ftp_version "$version" + echo "delete_ftp_version "$version"" fi fi fi @@ -183,7 +183,7 @@ process_bunny_storage() { echo "Bunny Version: $version | Age: $age days" if [ "$age" -gt "$DELETE_OLDER" ]; then - delete_bunny_version "$version" + echo "delete_bunny_version "$version"" fi fi fi From 361056046fcfbc3b9328d84578a54da496390796 Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Thu, 12 Nov 2026 14:03:35 +0200 Subject: [PATCH 3/3] Update maven_clean.sh -actual delete enabled --- scripts/maven_clean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh index c5849af..6be40f1 100644 --- a/scripts/maven_clean.sh +++ b/scripts/maven_clean.sh @@ -157,7 +157,7 @@ process_ftp_storage() { echo "FTP Version: $version | Age: $age days" if [ "$age" -gt "$DELETE_OLDER" ]; then - echo "delete_ftp_version "$version"" + delete_ftp_version "$version" fi fi fi @@ -183,7 +183,7 @@ process_bunny_storage() { echo "Bunny Version: $version | Age: $age days" if [ "$age" -gt "$DELETE_OLDER" ]; then - echo "delete_bunny_version "$version"" + delete_bunny_version "$version" fi fi fi