Delete

.vscode/launch.json

@@ -13,7 +13,8 @@
             "args": [
                 "-port",
                 "8088",
-            ]
+            ],
+            "env": {"CGO_ENABLED": "0"}
         }
     ]
 }

README.md

@@ -74,6 +74,17 @@ curl http://127.0.0.1:8080/62fb66ee6841600228945ef592c8998e097c51271f9acf1f15e72
 12
 ```
 
+#### Delete Value
+
+```bash
+# delete everything with this upload key
+curl -s https://your-server.com/delete/1e1c7e5f220d2eee5ebbfd1428b84aaf1570ca4f88105a81feac901850b20a77
+```
+
+```plain
+OK
+```
+
 ### Create Key Pair
 
 The upload key is just random data with a length of 256bit encoded in hex, the download key is derived a each upload time. The download key is just a hashed upload key with sha256.

build.ps1

@@ -15,6 +15,8 @@ if (-Not (Test-Path $outputDir)) {
 
 # Build the application
 Write-Host "Building application for Linux AMD64..."
+
+$env:CGO_ENABLED = 0
 go build -ldflags="-w -s" -o "$outputDir/$binaryName" .
 
 # Check if the build was successful

httphandler/deleteHandler.go

@@ -0,0 +1,27 @@
+package httphandler
+
+import (
+	"net/http"
+
+	"github.com/dhcgn/iot-ephemeral-value-store/domain"
+	"github.com/gorilla/mux"
+)
+
+func (c Config) DeleteHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	uploadKey := vars["uploadKey"]
+
+	downloadKey, err := domain.DeriveDownloadKey(uploadKey)
+	if err != nil {
+		http.Error(w, "Error deriving download key", http.StatusInternalServerError)
+		return
+	}
+
+	if err := c.StorageInstance.Delete(downloadKey); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte("OK"))
+}

main.go

@@ -123,11 +123,16 @@ func createRouter(hhc httphandler.Config, mc middleware.Config) *mux.Router {
 	// New routes
 	r.HandleFunc("/u/{uploadKey}", hhc.UploadHandler).Methods("GET")
 	r.HandleFunc("/u/{uploadKey}/", hhc.UploadHandler).Methods("GET")
+
 	r.HandleFunc("/d/{downloadKey}/json", hhc.DownloadHandler).Methods("GET")
 	r.HandleFunc("/d/{downloadKey}/plain/{param:.*}", hhc.PlainDownloadHandler).Methods("GET")
 	// New routes with nestetd paths, eg. /u/1234/param1
 	r.HandleFunc("/patch/{uploadKey}/{param:.*}", hhc.UploadAndPatchHandler).Methods("GET")
 
+	// Admin
+	r.HandleFunc("/delete/{uploadKey}", hhc.DeleteHandler).Methods("GET")
+	r.HandleFunc("/delete/{uploadKey}/", hhc.DeleteHandler).Methods("GET")
+
 	r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		key := domain.GenerateRandomKey()
 		key_down, err := domain.DeriveDownloadKey(key)

main_router_test.go

@@ -74,9 +74,9 @@ func TestLegacyRoutes(t *testing.T) {
 		checkBody          bool
 		bodyContains       string
 	}{
-		{"GET /", "GET", "/" + key_up + "/" + "?value=8923423", http.StatusOK, true, "Data uploaded successfully"},
-		{"GET /", "GET", "/" + key_down + "/" + "plain/value", http.StatusOK, true, "8923423\n"},
-		{"GET /", "GET", "/" + key_down + "/" + "json", http.StatusOK, true, "\"value\":\"8923423\""},
+		{"Upload", "GET", "/" + key_up + "/" + "?value=8923423", http.StatusOK, true, "Data uploaded successfully"},
+		{"Download Plain", "GET", "/" + key_down + "/" + "plain/value", http.StatusOK, true, "8923423\n"},
+		{"Downlaod JSON", "GET", "/" + key_down + "/" + "json", http.StatusOK, true, "\"value\":\"8923423\""},
 	}
 
 	for _, tt := range tests {
@@ -133,6 +133,43 @@ func TestRoutesUploadDownload(t *testing.T) {
 	}
 }
 
+func TestRoutesUploadDownloadDelete(t *testing.T) {
+	httphandlerConfig, middlewareConfig := createTestEnvireonment(t)
+
+	router := createRouter(httphandlerConfig, middlewareConfig)
+
+	tests := []struct {
+		name               string
+		url                string
+		expectedStatusCode int
+		bodyContains       string
+	}{
+		{"Upload", "/u/" + key_up + "/" + "?value=8923423", http.StatusOK, "Data uploaded successfully"},
+		{"Download plain", "/d/" + key_down + "/" + "plain/value", http.StatusOK, "8923423\n"},
+		{"Download json", "/d/" + key_down + "/" + "json", http.StatusOK, "\"value\":\"8923423\""},
+		{"Delete", "/delete/" + key_up + "/", http.StatusOK, "OK"},
+		{"Download after delete plain", "/d/" + key_down + "/" + "plain/value", http.StatusNotFound, ""},
+		{"Download after delete json", "/d/" + key_down + "/" + "json", http.StatusNotFound, ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req, err := http.NewRequest("GET", tt.url, nil)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			rr := httptest.NewRecorder()
+			router.ServeHTTP(rr, req)
+
+			assert.Equal(t, tt.expectedStatusCode, rr.Code)
+			if tt.bodyContains != "" {
+				assert.Contains(t, rr.Body.String(), tt.bodyContains)
+			}
+		})
+	}
+}
+
 func TestLegacyRoutesWithDifferentPathEndings(t *testing.T) {
 	httphandlerConfig, middlewareConfig := createTestEnvireonment(t)
 

static/index.html

@@ -80,11 +80,15 @@ <h1>Welcome to the IoT Ephemeral Value Store Server</h1>
         <h2>Getting Started</h2>
         <p>
             Just use this url generated just for you: <br>
+            <h4>Upload data</h4>
             <a class="dynamic-link" data-path="/u/{{.UploadKey}}/?name=value">/u/{{.UploadKey}}/?name=value</a><br>
+            <h4>Download data</h4>
             and access it with<br>
             <a class="dynamic-link" data-path="/d/{{.DownloadKey}}/plain/name">/d/{{.DownloadKey}}/plain/name</a><br>
             or in json with<br>
             <a class="dynamic-link" data-path="/d/{{.DownloadKey}}/json">/d/{{.DownloadKey}}/json</a>
+            <h4>Delete data (or wait for retention time)</h4>
+            <a class="dynamic-link" data-path="/delete/{{.UploadKey}}">/u/{{.UploadKey}}/?name=value</a><br>
         </p>
 
         <h2>Server Settings</h2>

storage/storage.go

@@ -18,6 +18,7 @@ type StorageInstance struct {
 
 type Storage interface {
 	GetJSON(downloadKey string) ([]byte, error)
+	Delete(downloadKey string) error
 	Store(downloadKey string, dataToStore map[string]interface{}) error
 	Retrieve(downloadKey string) (map[string]interface{}, error)
 }
@@ -103,3 +104,9 @@ func (c StorageInstance) Retrieve(downloadKey string) (map[string]interface{}, e
 	})
 	return existingData, err
 }
+
+func (c StorageInstance) Delete(downloadKey string) error {
+	return c.Db.Update(func(txn *badger.Txn) error {
+		return txn.Delete([]byte(downloadKey))
+	})
+}