version 0.6.0: add tombstone object support

.gitignore

@@ -19,6 +19,7 @@ main
 
 # Package configuration file (not including sample configuration)
 config.toml
+config.prod.toml
 
 # MaxMind GeoLite2 Country database files
 GeoLite2-Country.mmdb

lib/db/models.go

 package db
 
+import (
+	"time"
+)
+
 // Object represents a partial object from the database.
 type Object struct {
-	ContentType *string `json:"content_type"`
-	DestURL     *string `json:"dest_url"`
-	ObjectType  int     `json:"object_type"`
+	ContentType  *string    `json:"content_type"`
+	DestURL      *string    `json:"dest_url"`
+	ObjectType   int        `json:"object_type"`
+	DeletedAt    *time.Time `json:"deleted_at"`
+	DeleteReason *string    `json:"delete_reason"`
 }

lib/db/queries.go

@@ -3,6 +3,8 @@ package db
 import (
 	"database/sql"
 	"fmt"
+
+	"github.com/lib/pq"
 )
 
 // SelectObjectByBucketKey returns an object from a bucket and a key.
@@ -12,8 +14,10 @@ func SelectObjectByBucketKey(bucket, key string) (Object, error) {
 	var contentType sql.NullString
 	var destURL sql.NullString
 	var objectType int
+	var deletedAt pq.NullTime
+	var deleteReason sql.NullString
 	err := DB.QueryRow(selectObjectByBucketKey, fmt.Sprintf("%s/%s", bucket, key)).
-		Scan(&contentType, &destURL, &objectType)
+		Scan(&contentType, &destURL, &objectType, &deletedAt, &deleteReason)
 	if err != nil {
 		return object, err
 	}
@@ -25,6 +29,12 @@ func SelectObjectByBucketKey(bucket, key string) (Object, error) {
 	if destURL.Valid {
 		object.DestURL= &destURL.String
 	}
+	if deletedAt.Valid {
+		object.DeletedAt = &deletedAt.Time
+		if deleteReason.Valid {
+			object.DeleteReason = &deleteReason.String
+		}
+	}
 	object.ObjectType = objectType
 	return object, nil
 }

lib/db/sql.go

@@ -4,7 +4,9 @@ var selectObjectByBucketKey = `
 SELECT
 	content_type,
 	dest_url,
-	"type"
+	"type",
+	deleted_at,
+	delete_reason
 FROM
 	objects
 WHERE

main.go

@@ -325,5 +325,18 @@ func requestHandler(ctx *fasthttp.RequestCtx) {
 			ctx.SetStatusCode(fasthttp.StatusOK)
 		}
 		recordMetrics(ctx)
+
+	case 2: // tombstone
+		ctx.SetUserValue("object_type", "tombstone")
+
+		// Send 410 gone response
+		ctx.SetStatusCode(fasthttp.StatusGone)
+		ctx.SetContentType("text/plain; charset=utf8")
+		reason := "no reason specified"
+		if object.DeleteReason != nil && *object.DeleteReason != "" {
+			reason = *object.DeleteReason
+		}
+		fmt.Fprintf(ctx, "410 Gone: %s\n\nReason: %s", ctx.Path(), reason)
+		recordMetrics(ctx)
 	}
 }