@@ -110,6 +110,9 @@ class Config(object):

     cache_file = ""

     add_headers = ""

     ignore_failed_copy = False

+    expiry_days = ""

+    expiry_date = ""

+    expiry_prefix = ""

     ## Creating a singleton

     def __new__(self, configfile = None):

@@ -14,6 +14,7 @@ import logging

 import mimetypes

 import re

 from xml.sax import saxutils

+import base64

 from logging import debug, info, warning, error

 from stat import ST_SIZE

@@ -371,6 +372,62 @@ class S3(object):

         return response

+    def expiration_info(self, uri, bucket_location = None):

+        headers = SortedDict(ignore_case = True)

+        bucket = uri.bucket()

+        body = ""

+

+        request = self.create_request("BUCKET_LIST", bucket = bucket, extra="?lifecycle")

+        try:

+            response = self.send_request(request, body)

+            response['prefix'] = getTextFromXml(response['data'], ".//Rule//Prefix")

+            response['date'] = getTextFromXml(response['data'], ".//Rule//Expiration//Date")

+            response['days'] = getTextFromXml(response['data'], ".//Rule//Expiration//Days")

+            return response

+        except S3Error, e:

+            if e.status == 404:

+                debug("Could not get /?lifecycle - lifecycle probably not configured for this bucket")

+                return None

+            raise

+

+    def expiration_set(self, uri, bucket_location = None):

+        if self.config.expiry_date and self.config.expiry_days:

+             raise ParameterError("Expect either --expiry-day or --expiry-date")

+        if not (self.config.expiry_date or self.config.expiry_days):

+             if self.config.expiry_prefix:

+                 raise ParameterError("Expect either --expiry-day or --expiry-date")

+             debug("del bucket lifecycle")

+             bucket = uri.bucket()

+             body = ""

+             request = self.create_request("BUCKET_DELETE", bucket = bucket, extra="?lifecycle")

+        else:

+             request, body = self._expiration_set(uri)

+        debug("About to send request '%s' with body '%s'" % (request, body))

+        response = self.send_request(request, body)

+        debug("Received response '%s'" % (response))

+        return response

+

+    def _expiration_set(self, uri):

+        debug("put bucket lifecycle")

+        body = '<LifecycleConfiguration>'

+        body += '  <Rule>'

+        body += ('    <Prefix>%s</Prefix>' % self.config.expiry_prefix)

+        body += ('    <Status>Enabled</Status>')

+        body += ('    <Expiration>')

+        if self.config.expiry_date:

+            body += ('    <Date>%s</Date>' % self.config.expiry_date)

+        elif self.config.expiry_days:

+            body += ('    <Days>%s</Days>' % self.config.expiry_days)

+        body += ('    </Expiration>')

+        body += '  </Rule>'

+        body += '</LifecycleConfiguration>'

+

+        headers = SortedDict(ignore_case = True)

+        headers['content-md5'] = compute_content_md5(body)

+        bucket = uri.bucket()

+        request =  self.create_request("BUCKET_CREATE", bucket = bucket, headers = headers, extra="?lifecycle")

+        return (request, body)

+

     def add_encoding(self, filename, content_type):

         if content_type.find("charset=") != -1:

            return False

@@ -1095,4 +1152,11 @@ def parse_attrs_header(attrs_header):

         key, val = attr.split(":")

         attrs[key] = val

     return attrs

+

+def compute_content_md5(body):

+    m = md5(body)

+    base64md5 = base64.encodestring(m.digest())

+    if base64md5[-1] == '\n':

+        base64md5 = base64md5[0:-1]

+    return base64md5

 # vim:et:ts=4:sts=4:ai

@@ -242,6 +242,25 @@ def cmd_website_delete(args):

             else:

                 raise

+def cmd_expiration_set(args):

+    s3 = S3(Config())

+    for arg in args:

+        uri = S3Uri(arg)

+        if not uri.type == "s3" or not uri.has_bucket() or uri.has_object():

+            raise ParameterError("Expecting S3 URI with just the bucket name set instead of '%s'" % arg)

+        try:

+            response = s3.expiration_set(uri, cfg.bucket_location)

+            if response["status"] is 200:

+                output(u"Bucket '%s': expiration configuration is set." % (uri.uri()))

+            elif response["status"] is 204:

+                output(u"Bucket '%s': expiration configuration is deleted." % (uri.uri()))

+        except S3Error, e:

+            if S3.codes.has_key(e.info["Code"]):

+                error(S3.codes[e.info["Code"]] % uri.bucket())

+                return

+            else:

+                raise

+

 def cmd_bucket_delete(args):

     def _bucket_delete_one(uri):

         try:

@@ -724,9 +743,23 @@ def cmd_info(args):

                 info = s3.bucket_info(uri)

                 output(u"%s (bucket):" % uri.uri())

                 output(u"   Location:  %s" % info['bucket-location'])

+                try:

+                    expiration = s3.expiration_info(uri, cfg.bucket_location)

+                    expiration_desc = "Expiration Rule: "

+                    if expiration['prefix'] == "":

+                        expiration_desc += "all objects in this bucket "

+                    else:

+                        expiration_desc += "objects with key prefix '" + expiration['prefix'] + "' "

+                    expiration_desc += "will expire in '"

+                    if expiration['days']:

+                        expiration_desc += expiration['days'] + "' day(s) after creation"

+                    elif expiration['date']:

+                        expiration_desc += expiration['date'] + "' "

+                    output(u"   %s" % expiration_desc)

+                except:

+                    output(u"   Expiration Rule: none")

             acl = s3.get_acl(uri)

             acl_grant_list = acl.getGrantList()

-

             try:

                 policy = s3.get_policy(uri)

                 output(u"   policy: %s" % policy)

@@ -1860,6 +1893,9 @@ def get_commands_list():

     {"cmd":"ws-delete", "label":"Delete Website", "param":"s3://BUCKET", "func":cmd_website_delete, "argc":1},

     {"cmd":"ws-info", "label":"Info about Website", "param":"s3://BUCKET", "func":cmd_website_info, "argc":1},

+    ## Lifecycle commands

+    {"cmd":"expire", "label":"Set or delete expiration rule for the bucket", "param":"s3://BUCKET", "func":cmd_expiration_set, "argc":1},

+

     ## CloudFront commands

     {"cmd":"cflist", "label":"List CloudFront distribution points", "param":"", "func":CfCmd.info, "argc":0},

     {"cmd":"cfinfo", "label":"Display CloudFront distribution point parameters", "param":"[cf://DIST_ID]", "func":CfCmd.info, "argc":0},

@@ -2052,6 +2088,10 @@ def main():

     optparser.add_option(      "--ws-index", dest="website_index", action="store", help="Name of index-document (only for [ws-create] command)")

     optparser.add_option(      "--ws-error", dest="website_error", action="store", help="Name of error-document (only for [ws-create] command)")

+    optparser.add_option(      "--expiry-date", dest="expiry_date", action="store", help="Indicates when the expiration rule take effect. (only for [expire] comman)")

+    optparser.add_option(      "--expiry-days", dest="expiry_days", action="store", help="Indicates the number of days after object creation the expiration rule take effect. (only for [expire] command)")

+    optparser.add_option(      "--expiry-prefix", dest="expiry_prefix", action="store", help="Identifying one or more objects with the prefix to which the expiration rule applies. (only for [expire] command)")

+

     optparser.add_option(      "--progress", dest="progress_meter", action="store_true", help="Display progress meter (default on TTY).")

     optparser.add_option(      "--no-progress", dest="progress_meter", action="store_false", help="Don't display progress meter (default on non-TTY).")

     optparser.add_option(      "--enable", dest="enable", action="store_true", help="Enable given CloudFront distribution (only for [cfmodify] command)")