Fixed deletion of all lifecycle rules

Author: jcameron

Diff for: IDEAS

@@ -45,11 +45,6 @@
 	- Verify PHP package installation in Virtualmin
 	- Check that DKIM works
 
- - Amazon glacier support
-	- how to clear all lifecycle rules
-	- Documentation
-	- https://www.virtualmin.com/node/27461
-
  - Use Envelope-from address in hamtrap checking
 	- https://www.virtualmin.com/node/27501
 	- don't set smtpd_sasl_authenticated_header

Diff for: S3.pm

@@ -90,6 +90,8 @@ sub canonical_string {
         $buf .= '?location';
     } elsif ($path =~ /[&?]uploads($|=|&)/) {
         $buf .= '?uploads';
+    } elsif ($path =~ /[&?]lifecycle($|=|&)/) {
+        $buf .= '?lifecycle';
     } elsif ($path =~ /[&?]partNumber=([0-9]+)&uploadId=([^&]+)/) {
         $buf .= '?partNumber='.$1.'&uploadId='.$2;
     } elsif ($path =~ /[&?]uploadId=([^&]+)/) {

Diff for: S3/AWSAuthConnection.pm

@@ -220,6 +220,14 @@ sub put_bucket_lifecycle {
         $self->_make_request('PUT', "$bucket/?lifecycle", $headers, $lifecycle_xml_doc));
 }
 
+sub delete_bucket_lifecycle {
+    my ($self, $bucket, $headers) = @_;
+    croak 'must specify bucket' unless $bucket;
+    $headers ||= {};
+
+    return S3::Response->new($self->_make_request('DELETE', "$bucket/?lifecycle", $headers));
+}
+
 sub abort_upload {
     my ($self, $bucket, $key, $uploadid, $headers) = @_;
     croak 'must specify bucket' unless $bucket;

Diff for: backup_form.cgi

@@ -185,7 +185,8 @@ foreach $dest (@dests) {
 	# Add purging option
 	@grid = ( );
 	if (!$nopurge) {
-		push(@grid, &hlink($text{'backup_purge'}, "backup_purge"));
+		push(@grid, &hlink($text{'backup_purge'}, "backup_purge").
+			    " ");
 		push(@grid, &ui_opt_textbox("purge".$i, $purges[$i], 5,
 			$text{'backup_purgeno'}, $text{'backup_purgeyes'})." ".
 			$text{'newbw_days'});

Diff for: s3-lib.pl

@@ -474,10 +474,20 @@ sub s3_put_bucket_lifecycle
 &require_s3();
 local ($akey, $skey, $bucket, $lifecycle) = @_;
 local $conn = &make_s3_connection($akey, $skey);
-local $xs = XML::Simple->new(KeepRoot => 1);
-local $xml = $xs->XMLout({ 'LifecycleConfiguration' => [ $lifecycle ] });
-local $response = $conn->put_bucket_lifecycle($bucket, $xml);
-return $response->http_response->code == 200 ? undef : 
+local $response;
+if (@{$lifecycle->{'Rule'}}) {
+	# Update lifecycle config
+	local $xs = XML::Simple->new(KeepRoot => 1);
+	local $xml = $xs->XMLout(
+		{ 'LifecycleConfiguration' => [ $lifecycle ] });
+	$response = $conn->put_bucket_lifecycle($bucket, $xml);
+	}
+else {
+	# Delete lifecycle config
+	$response = $conn->delete_bucket_lifecycle($bucket, $xml);
+	}
+return $response->http_response->code == 200 ||
+       $response->http_response->code == 204 ? undef : 
 	&text('s3_eputlifecycle', &extract_s3_message($response));
 }