Delete (#6)

* log requests * delete file * fix some error messages
theleeeo · Oct 23, 2024 · 726f9de · 726f9de
1 parent 0f8745c
commit 726f9de
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 21 deletions.
diff --git a/authorization/plugin/allow_types.go b/authorization/plugin/allow_types.go
@@ -26,6 +26,8 @@ func NewAllowTypesPlugin(args []string) (*AllowTypesPlugin, error) {
 			reqType = authorization.RequestType_REQUEST_TYPE_GET_METADATA
 		case "list":
 			reqType = authorization.RequestType_REQUEST_TYPE_LIST
+		case "delete":
+			reqType = authorization.RequestType_REQUEST_TYPE_DELETE
 		default:
 			return nil, status.Error(codes.InvalidArgument, "unknown request type: "+arg)
 		}

diff --git a/authorization/v1/authorization.pb.go b/authorization/v1/authorization.pb.go
diff --git a/mocks/provider.go b/mocks/provider.go
@@ -87,3 +87,12 @@ func (p *Provider) ListObjects(ctx context.Context, prefix string) (provider.Lis
 
 	return called.Get(0).(provider.ListObjectsResponse), called.Error(1)
 }
+
+func (p *Provider) DeleteObject(ctx context.Context, key string) error {
+	called := p.Called(ctx, key)
+	if called.Get(0) == nil {
+		return nil
+	}
+
+	return called.Error(0)
+}
diff --git a/proto/authorization/v1/authorization.proto b/proto/authorization/v1/authorization.proto
@@ -13,6 +13,7 @@ enum RequestType {
   REQUEST_TYPE_UPLOAD = 2;
   REQUEST_TYPE_GET_METADATA = 3;
   REQUEST_TYPE_LIST = 4;
+  REQUEST_TYPE_DELETE = 5;
 }
 
 message AuthorizeRequest {

diff --git a/provider/gocloud.go b/provider/gocloud.go
@@ -126,3 +126,15 @@ func (n *GocloudProvider) ListObjects(ctx context.Context, prefix string) (ListO
 		Keys: files,
 	}, nil
 }
+
+func (n *GocloudProvider) DeleteObject(ctx context.Context, key string) error {
+	if err := n.bucket.Delete(ctx, key); err != nil {
+		if gcerrors.Code(err) == gcerrors.NotFound {
+			return ErrNotFound
+		}
+
+		return err
+	}
+
+	return nil
+}
diff --git a/provider/log.go b/provider/log.go
@@ -60,3 +60,8 @@ func (n *LogProvider) ListObjects(ctx context.Context, prefix string) (ListObjec
 	log.Printf("ListObjects %s\n", prefix)
 	return ListObjectsResponse{}, nil
 }
+
+func (n *LogProvider) DeleteObject(ctx context.Context, key string) error {
+	log.Printf("DeleteObject %s\n", key)
+	return nil
+}
diff --git a/provider/provider.go b/provider/provider.go
@@ -54,6 +54,7 @@ type Provider interface {
 	PutObject(ctx context.Context, key string, data io.Reader, opts PutOptions) error
 	GetTags(ctx context.Context, key string) (map[string]string, error)
 	ListObjects(ctx context.Context, prefix string) (ListObjectsResponse, error)
+	DeleteObject(ctx context.Context, key string) error
 }
 
 type GetOptions struct {

diff --git a/provider/s3.go b/provider/s3.go
@@ -232,3 +232,16 @@ func (s *S3Provider) ListObjects(ctx context.Context, prefix string) (ListObject
 		Keys: files,
 	}, nil
 }
+
+func (s *S3Provider) DeleteObject(ctx context.Context, key string) error {
+	_, err := s.client.DeleteObject(ctx, &s3.DeleteObjectInput{
+		Bucket: &s.bucketName,
+		Key:    &key,
+	})
+	if err != nil {
+		// S3 seems to return a 200 OK even if the object does not exist so no need to check for that.
+		return err
+	}
+
+	return nil
+}
diff --git a/provider/void.go b/provider/void.go
@@ -45,3 +45,7 @@ func (n *VoidProvider) GetTags(ctx context.Context, key string) (map[string]stri
 func (n *VoidProvider) ListObjects(ctx context.Context, prefix string) (ListObjectsResponse, error) {
 	return ListObjectsResponse{}, nil
 }
+
+func (n *VoidProvider) DeleteObject(ctx context.Context, key string) error {
+	return nil
+}
diff --git a/server/handlers.go b/server/handlers.go
@@ -28,6 +28,8 @@ func (s *Server) handleFile(w http.ResponseWriter, r *http.Request) {
 		reqType = authorization.RequestType_REQUEST_TYPE_DOWNLOAD
 	case http.MethodPut, http.MethodPost:
 		reqType = authorization.RequestType_REQUEST_TYPE_UPLOAD
+	case http.MethodDelete:
+		reqType = authorization.RequestType_REQUEST_TYPE_DELETE
 	default:
 		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
 		return
@@ -84,8 +86,28 @@ func (s *Server) handleFile(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := s.handleUpload(r, p, key); err != nil {
-		lerr.ToHTTP(w, err)
+	if reqType == authorization.RequestType_REQUEST_TYPE_UPLOAD {
+		if err := s.handleUpload(r, p, key); err != nil {
+			lerr.ToHTTP(w, err)
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
+		return
+	}
+
+	if reqType == authorization.RequestType_REQUEST_TYPE_DELETE {
+		if err := p.DeleteObject(r.Context(), key); err != nil {
+			if errors.Is(err, provider.ErrNotFound) {
+				http.Error(w, err.Error(), http.StatusNotFound)
+				return
+			}
+
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
 		return
 	}
 
@@ -177,14 +199,14 @@ func getDataSource(r *http.Request, allowRawBody bool) (io.ReadCloser, error) {
 		if err := r.ParseMultipartForm(10 << 20); err != nil {
 			log.Println("error parsing multipart form:", err)
 
-			return nil, lerr.Wrap(err, http.StatusBadRequest, "error parsing multipart form:")
+			return nil, lerr.Wrap(err, http.StatusBadRequest, "error parsing multipart form")
 		}
 
 		file, _, err := r.FormFile("file")
 		if err != nil {
 			log.Println("error getting file from form:", err)
 
-			return nil, lerr.Wrap(err, http.StatusBadRequest, "error getting file from form:")
+			return nil, lerr.Wrap(err, http.StatusBadRequest, "error getting file from form")
 		}
 		data = file
 	} else {
@@ -257,11 +279,7 @@ func (s *Server) authorizeRequest(ctx context.Context, reqType authorization.Req
 	}
 
 	if err := authPlugin.Authorize(ctx, req); err != nil {
-		s, ok := status.FromError(err)
-		if !ok {
-			return lerr.Newf(http.StatusInternalServerError, "plugin error not a grpc status! error=%s", err.Error())
-		}
-
+		s := status.Convert(err)
 		if s.Code() == codes.Unauthenticated {
 			return lerr.Newf(http.StatusUnauthorized, "Unauthenticated: %s", s.Message())
 		}

diff --git a/server/middlewares.go b/server/middlewares.go
@@ -26,6 +26,8 @@ func InternalErrorRedacter(next http.Handler) http.Handler {
 			return
 		}
 
+		log.Printf("%s %s %d", r.Method, r.URL.Path, respCatcher.Code)
+
 		copyHeaders(w.Header(), respCatcher.Header())
 		w.WriteHeader(respCatcher.Code)
 		_, _ = w.Write(respCatcher.Body.Bytes())