Merge pull request #167 from pixlise/development

Public User Data Exporting

api/endpoints/Export.go

@@ -47,16 +47,37 @@ type exportFilesParams struct {
 func registerExportHandler(router *apiRouter.ApiObjectRouter) {
 	const pathPrefix = "export"
 
-	router.AddGenericHandler(handlers.MakeEndpointPath(pathPrefix+"/files", datasetIdentifier), apiRouter.MakeMethodPermission("POST", permission.PermExportMap), exportFilesPost)
+	router.AddGenericHandler(handlers.MakeEndpointPath(pathPrefix+"/files", datasetIdentifier), apiRouter.MakeMethodPermission("POST", permission.PermPublic), exportFilesPost)
 }
 
 func exportFilesPost(params handlers.ApiHandlerGenericParams) error {
+	datasetID := params.PathParams[datasetIdentifier]
+
 	// Read in body
 	body, err := ioutil.ReadAll(params.Request.Body)
 	if err != nil {
 		return api.MakeBadRequestError(err)
 	}
 
+	isPublicUser := !params.UserInfo.Permissions[permission.PermExportMap]
+	isDatasetViewable := !isPublicUser
+
+	if isPublicUser {
+		publicObjectsAuth, err := permission.GetPublicObjectsAuth(params.Svcs.FS, params.Svcs.Config.ConfigBucket, isPublicUser)
+		if err != nil {
+			return err
+		}
+
+		isDatasetViewable, err = permission.CheckIsObjectInPublicSet(publicObjectsAuth.Datasets, datasetID)
+		if err != nil {
+			return err
+		}
+	}
+
+	if !isDatasetViewable {
+		return api.MakeBadRequestError(fmt.Errorf("Dataset %v is not public", datasetID))
+	}
+
 	var req exportFilesParams
 	err = json.Unmarshal(body, &req)
 	if err != nil {
@@ -78,8 +99,6 @@ func exportFilesPost(params handlers.ApiHandlerGenericParams) error {
 
 	// We need to export a ZIP file containing what is identified in File IDs
 
-	datasetID := params.PathParams[datasetIdentifier]
-
 	// Get the quantification file - if it's a shared file, quantUserID should be empty
 	quantPath := filepaths.GetUserQuantPath(params.UserInfo.UserID, datasetID, "")
 	quantID := req.QuantID

api/endpoints/Export_test.go

@@ -23,6 +23,7 @@ import (
 	"net/http"
 
 	"github.com/pixlise/core/v3/core/awsutil"
+	"github.com/pixlise/core/v3/core/pixlUser"
 )
 
 func Example_registerExportHandlerSunny() {
@@ -33,6 +34,16 @@ func Example_registerExportHandlerSunny() {
 
 	svcs := MakeMockSvcs(&mockS3, nil, nil, nil)
 	svcs.Exporter = &exp
+
+	mockUser := pixlUser.UserInfo{
+		Name:   "Niko Bellic",
+		UserID: "600f2a0806b6c70071d3d174",
+		Email:  "[email protected]",
+		Permissions: map[string]bool{
+			"export:map": true,
+		},
+	}
+	svcs.JWTReader = MockJWTReader{InfoToReturn: &mockUser}
 	apiRouter := MakeRouter(svcs)
 
 	req, _ := http.NewRequest("POST", "/export/files/983561", bytes.NewReader([]byte(`{
@@ -72,6 +83,16 @@ func Example_registerExportHandlerMissingFileName() {
 
 	svcs := MakeMockSvcs(&mockS3, nil, nil, nil)
 	svcs.Exporter = &exp
+	mockUser := pixlUser.UserInfo{
+		Name:   "Niko Bellic",
+		UserID: "600f2a0806b6c70071d3d174",
+		Email:  "[email protected]",
+		Permissions: map[string]bool{
+			"export:map": true,
+		},
+	}
+	svcs.JWTReader = MockJWTReader{InfoToReturn: &mockUser}
+
 	apiRouter := MakeRouter(svcs)
 
 	req, _ := http.NewRequest("POST", "/export/files/983561", bytes.NewReader([]byte(`{
@@ -95,6 +116,16 @@ func Example_registerExportHandlerMissingColumn() {
 
 	svcs := MakeMockSvcs(&mockS3, nil, nil, nil)
 	svcs.Exporter = &exp
+	mockUser := pixlUser.UserInfo{
+		Name:   "Niko Bellic",
+		UserID: "600f2a0806b6c70071d3d174",
+		Email:  "[email protected]",
+		Permissions: map[string]bool{
+			"export:map": true,
+		},
+	}
+	svcs.JWTReader = MockJWTReader{InfoToReturn: &mockUser}
+
 	apiRouter := MakeRouter(svcs)
 
 	req, _ := http.NewRequest("POST", "/export/files/983561", bytes.NewReader([]byte(`{
@@ -119,6 +150,16 @@ func Example_registerExportHandlerBadJSONBody() {
 
 	svcs := MakeMockSvcs(&mockS3, nil, nil, nil)
 	svcs.Exporter = &exp
+	mockUser := pixlUser.UserInfo{
+		Name:   "Niko Bellic",
+		UserID: "600f2a0806b6c70071d3d174",
+		Email:  "[email protected]",
+		Permissions: map[string]bool{
+			"export:map": true,
+		},
+	}
+	svcs.JWTReader = MockJWTReader{InfoToReturn: &mockUser}
+
 	apiRouter := MakeRouter(svcs)
 
 	req, _ := http.NewRequest("POST", "/export/files/983561", bytes.NewReader([]byte(`{