work on determining which secrets accessible to user

controllers/store_secrets.go

@@ -226,85 +226,93 @@ func UpdateSecret(c *gin.Context) {
 	s.DeviceName = input.DeviceName
 	s.DeviceCategory = input.DeviceCategory
 
-	// TODO:
-	// Get a list of matching secrets - SecretsSearchAllSafes
-	//secretList, err := models.SecretsSearchAllSafes(&s)
-	// Check if user has access to the safes containing those secrets - something like UserGetSafesAllowed but not quite
-	//allowedSafes, err := models.UserGetSafesAllowed(user_id)
-	// Make sure that the access is not readonly
-	// If user has access to more than one safe containing the secret, generate an error
-	// Otherwise, update the secret
+	secretList, err := models.SecretsGetAllowedForGroup(&s, user_id)
 
-	allowedUpdate, err := CheckUpdateSecretAllowed(&s, int(user_id))
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("error determining secret : '%s'", err)})
 		return
 	}
 
-	if allowedUpdate != 0 {
-		s.SafeId = allowedUpdate
-	}
-
-	// Query which safes the current user is allowed to access
-
-	/*
-		safeId := SecretCheckSafeAllowed(int(user_id), input)
-		if safeId == 0 {
-			c.JSON(http.StatusBadRequest, gin.H{"error": "error determining safe"})
-			return
-		}
-
-		s.SafeId = safeId
-	*/
-
-	// TODO - replace this with a call to SecretsGetMultipleSafes
-
-	// Confirm that the secret already exists
-	checkExists, err := models.GetSecrets(&s, false)
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+	if len(secretList) == 0 {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "no secret matching search parameters"})
 		return
-	}
-	if len(checkExists) == 0 {
-		err = errors.New("UpdateSecret could not find existing secret to update")
-		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-		return
-	} else if len(checkExists) == 1 {
-		// Set the secret id with the one retrieved from the database
-		s.SecretId = checkExists[0].SecretId
-
-		// check for empty fields in the update request and update from the existing record
-		if s.UserName == "" {
-			s.UserName = checkExists[0].UserName
-		}
-		if s.DeviceCategory == "" {
-			s.DeviceCategory = checkExists[0].DeviceCategory
-		}
-		if s.DeviceName == "" {
-			s.DeviceName = checkExists[0].DeviceName
-		}
-
-		// Encrypt secret
-		s.Secret = input.SecretValue
-		_, err = s.EncryptSecret()
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"error": "UpdateSecret error encrypting secret : " + err.Error()})
-			return
-		}
-
-		_, err = s.UpdateSecret()
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"error": "UpdateSecret error saving secret : " + err.Error()})
-			return
-		}
-
+	} else if len(secretList) == 1 {
+		// Update secret
+		log.Printf("mock updating secret\n")
 		c.JSON(http.StatusOK, gin.H{"message": "secret updated successfully"})
 	} else {
-		err = errors.New("UpdateSecret found multiple secrets matching input data, be more specific")
-		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "multiple secrets matched search parameters, be more specific"})
 		return
 	}
 
+	/*
+		// TODO:
+		// Get a list of matching secrets - SecretsSearchAllSafes
+		//secretList, err := models.SecretsSearchAllSafes(&s)
+		// Check if user has access to the safes containing those secrets - something like UserGetSafesAllowed but not quite
+		//allowedSafes, err := models.UserGetSafesAllowed(user_id)
+		// Make sure that the access is not readonly
+		// If user has access to more than one safe containing the secret, generate an error
+		// Otherwise, update the secret
+
+		allowedUpdate, err := CheckUpdateSecretAllowed(&s, int(user_id))
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("error determining secret : '%s'", err)})
+			return
+		}
+
+		if allowedUpdate != 0 {
+			s.SafeId = allowedUpdate
+		}
+		// TODO - replace this with a call to SecretsGetMultipleSafes
+
+		// Confirm that the secret already exists
+		checkExists, err := models.GetSecrets(&s, false)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+		if len(checkExists) == 0 {
+			err = errors.New("UpdateSecret could not find existing secret to update")
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		} else if len(checkExists) == 1 {
+			// Set the secret id with the one retrieved from the database
+			s.SecretId = checkExists[0].SecretId
+
+			// check for empty fields in the update request and update from the existing record
+			if s.UserName == "" {
+				s.UserName = checkExists[0].UserName
+			}
+			if s.DeviceCategory == "" {
+				s.DeviceCategory = checkExists[0].DeviceCategory
+			}
+			if s.DeviceName == "" {
+				s.DeviceName = checkExists[0].DeviceName
+			}
+
+			// Encrypt secret
+			s.Secret = input.SecretValue
+			_, err = s.EncryptSecret()
+			if err != nil {
+				c.JSON(http.StatusBadRequest, gin.H{"error": "UpdateSecret error encrypting secret : " + err.Error()})
+				return
+			}
+
+			_, err = s.UpdateSecret()
+			if err != nil {
+				c.JSON(http.StatusBadRequest, gin.H{"error": "UpdateSecret error saving secret : " + err.Error()})
+				return
+			}
+
+			c.JSON(http.StatusOK, gin.H{"message": "secret updated successfully"})
+		} else {
+			err = errors.New("UpdateSecret found multiple secrets matching input data, be more specific")
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+	*/
+
 }
 
 func SecretCheckSafeAllowed(user_id int, input StoreInput) int {