Pulling in the bulk-delete branch.

APTrust · Jan 30, 2024 · 7c2bb05 · 7c2bb05
2 parents f8ff028 + 13e2e79
commit 7c2bb05
Show file tree

Hide file tree

Showing 49 changed files with 1,493 additions and 661 deletions.
diff --git a/.env.dev b/.env.dev
@@ -45,6 +45,11 @@ HTTPS_COOKIES=false
 #
 NSQ_URL='http://localhost:4151'
 
+# 
+# Secret key required to perform batch deletions.
+# 
+BATCH_DELETION_KEY="00000000-0000-0000-0000-000000000000"
+
 #
 # Two-Factor auth settings.
 #

diff --git a/.env.docker b/.env.docker
@@ -16,6 +16,7 @@
 # AUTHY_API_KEY
 # AWS_SES_PWD
 # AWS_SES_USER
+# BATCH_DELETION_KEY
 # COOKIE_BLOCK_KEY
 # COOKIE_DOMAIN
 # COOKIE_HASH_KEY

diff --git a/.env.integration b/.env.integration
@@ -45,6 +45,11 @@ HTTPS_COOKIES=false
 # items into queues.
 NSQ_URL='http://localhost:4151'
 
+# 
+# Secret key required to perform batch deletions.
+# 
+BATCH_DELETION_KEY="00000000-0000-0000-0000-000000000000"
+
 #
 # Two-Factor auth settings.
 #

diff --git a/.env.test b/.env.test
@@ -46,6 +46,11 @@ HTTPS_COOKIES=false
 # items into queues.
 NSQ_URL='http://localhost:4151'
 
+# 
+# Secret key required to perform batch deletions.
+# 
+BATCH_DELETION_KEY="00000000-0000-0000-0000-000000000000"
+
 #
 # Two-Factor auth settings.
 #

diff --git a/.env.travis b/.env.travis
@@ -45,6 +45,11 @@ HTTPS_COOKIES=false
 #
 NSQ_URL='http://localhost:4151'
 
+# 
+# Secret key required to perform batch deletions.
+# 
+BATCH_DELETION_KEY="00000000-0000-0000-0000-000000000000"
+
 #
 # Two-Factor auth settings.
 #

diff --git a/.env.uidemo b/.env.uidemo
@@ -50,6 +50,11 @@ HTTPS_COOKIES=true
 #
 NSQ_URL='http://localhost:4151'
 
+# 
+# Secret key required to perform batch deletions.
+# 
+BATCH_DELETION_KEY="00000000-0000-0000-0000-000000000000"
+
 #
 # Two-Factor auth settings.
 #

diff --git a/Dockerfile.multi b/Dockerfile.multi
@@ -78,8 +78,8 @@ ENV LOG_TO_CONSOLE=true
 ENV LOG_SQL=false
 ENV AWS_SES_PWD=password
 ENV [email protected]
+ENV BATCH_DELETION_KEY=key
 
-ENV BATCH_DELETION_KEY=66f93cdf-8c25-4693-8990-68ab415a1449
 # Making a note for a new dockerfile test. 
 EXPOSE 8080
 

diff --git a/alert_templates/deletion_confirmed.txt b/alert_templates/deletion_confirmed.txt
@@ -6,7 +6,11 @@ For your reference, the link below has information about the request.
 
 {{ .deletionReadOnlyURL }}
 
-The Work Item showing the status of this deletion is at {{ .workItemURL }}
+The Work Items showing the status of this deletion are at 
+
+{{ range $index, $itemUrl := .workItemURLs }}
+{{ $itemUrl }}
+{{ end }}
 
 If you have questions, please contact us at [email protected].
 

diff --git a/app/application.go b/app/application.go
@@ -379,6 +379,7 @@ func initRoutes(router *gin.Engine) {
 		adminAPI.PUT("/objects/update/:id", admin_api.IntellectualObjectUpdate)
 		adminAPI.DELETE("/objects/delete/:id", admin_api.IntellectualObjectDelete)
 		adminAPI.POST("/objects/init_restore/:id", admin_api.IntellectualObjectInitRestore)
+		adminAPI.POST("/objects/init_batch_delete", admin_api.IntellectualObjectInitBatchDelete)
 
 		// Premis Events
 		adminAPI.POST("/events/create", admin_api.PremisEventCreate)

diff --git a/common/config.go b/common/config.go
@@ -79,14 +79,15 @@ type RedisConfig struct {
 }
 
 type Config struct {
-	Cookies   *CookieConfig
-	DB        *DBConfig
-	EnvName   string
-	Logging   *LoggingConfig
-	NsqUrl    string
-	TwoFactor *TwoFactorConfig
-	Email     *EmailConfig
-	Redis     *RedisConfig
+	Cookies          *CookieConfig
+	DB               *DBConfig
+	EnvName          string
+	Logging          *LoggingConfig
+	NsqUrl           string
+	TwoFactor        *TwoFactorConfig
+	Email            *EmailConfig
+	Redis            *RedisConfig
+	BatchDeletionKey string
 }
 
 // Returns a new config based on APT_ENV
@@ -181,7 +182,8 @@ func loadConfig() *Config {
 			FlashCookie:   v.GetString("FLASH_COOKIE_NAME"),
 			PrefsCookie:   v.GetString("PREFS_COOKIE_NAME"),
 		},
-		NsqUrl: nsqUrl,
+		NsqUrl:           nsqUrl,
+		BatchDeletionKey: v.GetString("BATCH_DELETION_KEY"),
 		TwoFactor: &TwoFactorConfig{
 			AuthyAPIKey:   v.GetString("AUTHY_API_KEY"),
 			AuthyEnabled:  v.GetBool("ENABLE_TWO_FACTOR_AUTHY"),

diff --git a/common/errors.go b/common/errors.go
@@ -144,6 +144,14 @@ var ErrCountTypeNotSupported = errors.New("type is not supported for view count"
 // but they shouldn't be doing it in this context.
 var ErrMustCompleteReset = errors.New("you must complete your own password reset")
 
+// ErrInvalidObjectID occurs when requesting a batch deletion that
+// contains one or more invalid object ids.
+var ErrInvalidObjectID = errors.New("one or more object ids is invalid")
+
+// ErrInvalidRequestorID occurs when APTrust admin submits batch delete
+// request on behalf of a user who is not allowed to initiate a batch deletion.
+var ErrInvalidRequestorID = errors.New("invalid requestor id")
+
 type ValidationError struct {
 	Errors map[string]string
 }

diff --git a/constants/permissions.go b/constants/permissions.go
@@ -47,6 +47,7 @@ const (
 	InstitutionRead                    = "InstitutionRead"
 	InstitutionUpdate                  = "InstitutionUpdate"
 	InstitutionUpdatePrefs             = "InstitutionUpdatePrefs"
+	IntellectualObjectBatchDelete      = "IntellectualObjectBatchDelete"
 	IntellectualObjectCreate           = "IntellectualObjectCreate"
 	IntellectualObjectDelete           = "IntellectualObjectDelete"
 	IntellectualObjectFinishBulkDelete = "IntellectualObjectFinishBulkDelete"
@@ -124,6 +125,7 @@ var Permissions = []Permission{
 	InstitutionRead,
 	InstitutionUpdate,
 	InstitutionUpdatePrefs,
+	IntellectualObjectBatchDelete,
 	IntellectualObjectCreate,
 	IntellectualObjectDelete,
 	IntellectualObjectFinishBulkDelete,
@@ -311,6 +313,7 @@ func initPermissions() {
 	sysAdmin[InstitutionRead] = true
 	sysAdmin[InstitutionUpdate] = true
 	sysAdmin[InstitutionUpdatePrefs] = true
+	sysAdmin[IntellectualObjectBatchDelete] = true
 	sysAdmin[IntellectualObjectCreate] = true
 	sysAdmin[IntellectualObjectDelete] = true           // preserv workers do this with sys admin account
 	sysAdmin[IntellectualObjectFinishBulkDelete] = true // not implemented yet

diff --git a/db/fixtures/deletion_requests.csv b/db/fixtures/deletion_requests.csv
@@ -1,4 +1,4 @@
-"id","institution_id","requested_by_id","requested_at","encrypted_confirmation_token","confirmed_by_id","confirmed_at","cancelled_by_id","cancelled_at","work_item_id"
-1,2,3,2021-05-13 11:10:32,$2a$10$TK8s1XnmWulSUdze8GN5uOgGmDDsnndQKF5/Rz1j0xaHT7AwXRVma,,,,,
-2,2,3,2021-05-13 11:10:33,$2a$10$TK8s1XnmWulSUdze8GN5uOgGmDDsnndQKF5/Rz1j0xaHT7AwXRVma,2,2021-05-13 11:10:33,,,
-3,2,3,2021-05-13 11:10:34,$2a$10$TK8s1XnmWulSUdze8GN5uOgGmDDsnndQKF5/Rz1j0xaHT7AwXRVma,,,2,2021-05-13 11:10:34,
+"id","institution_id","requested_by_id","requested_at","encrypted_confirmation_token","confirmed_by_id","confirmed_at","cancelled_by_id","cancelled_at"
+1,2,3,2021-05-13 11:10:32,$2a$10$TK8s1XnmWulSUdze8GN5uOgGmDDsnndQKF5/Rz1j0xaHT7AwXRVma,,,,
+2,2,3,2021-05-13 11:10:33,$2a$10$TK8s1XnmWulSUdze8GN5uOgGmDDsnndQKF5/Rz1j0xaHT7AwXRVma,2,2021-05-13 11:10:33,,
+3,2,3,2021-05-13 11:10:34,$2a$10$TK8s1XnmWulSUdze8GN5uOgGmDDsnndQKF5/Rz1j0xaHT7AwXRVma,,,2,2021-05-13 11:10:34