Fix endpoint parsing bug in S3 repository

clowd · Apr 18, 2022 · 1844366 · 1844366
1 parent 4be2e66
commit 1844366
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/SquirrelCli/Sync/S3Repository.cs b/src/SquirrelCli/Sync/S3Repository.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Amazon;
@@ -172,7 +173,12 @@ await RetryAsync(() => _client.DeleteObjectAsync(new DeleteObjectRequest { Bucke
 
             Log.Info("Done");
 
-            var endpoint = new Uri(_options.endpoint ?? RegionEndpoint.GetBySystemName(_options.region).GetEndpointForService("s3").Hostname);
+            var endpointHost = _options.endpoint ?? RegionEndpoint.GetBySystemName(_options.region).GetEndpointForService("s3").Hostname;
+
+            if (Regex.IsMatch(endpointHost, @"^https?:\/\/", RegexOptions.IgnoreCase)) {
+                endpointHost = new Uri(endpointHost, UriKind.Absolute).Host;
+            }
+
             var baseurl = $"https://{_options.bucket}.{endpoint.Host}/{_prefix}";
             Log.Info($"Bucket URL:  {baseurl}");
             Log.Info($"Setup URL:   {baseurl}{setupFile.Name}");