mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-19 12:06:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve s3 url parsing and use Net::Amazon::S3::Vendor

Browse Source
This commit is contained in:
Isaac Connor
2023-02-12 16:49:39 -05:00
parent aba6281296
commit b6c729c700
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/ZoneMinder/lib/ZoneMinder/Event.pm
View File

@@ -655,17 +655,27 @@ sub CopyTo {
if ( $$NewStorage{Url} ) {
my $url = $$NewStorage{Url};
$url =~ s/^(s3|s3fs):\/\///ig;
my ( $aws_id, $aws_secret, $aws_host, $aws_bucket, $subpath ) = ( $url =~ /^\s*([^:]+):([^@]+)@((https?:\/\/)?[^\/]*)\/([^\/]+)(\/.+)?\s*$/ );
$url =~ /^\s*(?<ID>[^:]+):(?<SECRET>[^@]+)@(?<HOST>(https?:\/\/)?[^\/]*)\/(?<BUCKET>[^\/]+)(?<SUBPATH>\/.+)?\s*$/;
my ( $aws_id, $aws_secret, $aws_host, $aws_bucket, $subpath ) = ($+{ID},$+{SECRET}, $+{HOST}, $+{BUCKET}, $+{SUBPATH});
$subpath = '' if !$subpath;
Debug("S3 url parsed to id:$aws_id secret:$aws_secret host:$aws_host, bucket:$aws_bucket, subpath:$subpath\n from $url");
if ( $aws_id and $aws_secret and $aws_host and $aws_bucket ) {
if ($aws_id and $aws_secret and $aws_host and $aws_bucket) {
eval {
require Net::Amazon::S3;
require Net::Amazon::S3::Vendor::Generic;
require File::Slurp;
my $vendor = undef;
if ($aws_host) {
$vendor = Net::Amazon::S3::Vendor::Generic->new(
host=>$aws_host,
authorization_method => 'Net::Amazon::S3::Signature::V4',
);
}
my $s3 = Net::Amazon::S3->new( {
aws_access_key_id => $aws_id,
aws_secret_access_key => $aws_secret,
( $aws_host ? ( host => $aws_host ) : () ),
authorization_method => 'Net::Amazon::S3::Signature::V4',
( $vendor ? (vendor => $vendor) : (
)),
});
my $bucket = $s3->bucket($aws_bucket);
if ( !$bucket ) {