llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 10:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add UploadFileSafe().

Browse Source
This commit is contained in:
Gucheng Wang 2021-11-20 16:21:15 +08:00
parent 9eb09b7db0
commit 95600414d9
5 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/resource.go
View File

@ -138,7 +138,7 @@ func (c *ApiController) UploadResource() {
fileType, _ = util.GetOwnerAndNameFromId(mimeType) fileType, _ = util.GetOwnerAndNameFromId(mimeType)
} }
fileUrl, objectKey, err := object.UploadFile(provider, fullFilePath, fileBuffer) fileUrl, objectKey, err := object.UploadFileSafe(provider, fullFilePath, fileBuffer)
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return

2
object/avatar.go
View File

@ -63,7 +63,7 @@ func getPermanentAvatarUrl(organization string, username string, url string) str
panic(err) panic(err)
} }
_, _, err = UploadFile(defaultStorageProvider, fullFilePath, fileBuffer) _, _, err = UploadFileSafe(defaultStorageProvider, fullFilePath, fileBuffer)
if err != nil { if err != nil {
panic(err) panic(err)
} }

4
object/record.go
View File

@ -77,6 +77,10 @@ func AddRecord(record *Record) bool {
} }
} }
if record.Organization == "app" {
return false
}
record.Owner = record.Organization record.Owner = record.Organization
errWebhook := SendWebhooks(record) errWebhook := SendWebhooks(record)

21
object/storage.go
View File

@ -46,7 +46,7 @@ func getUploadFileUrl(provider *Provider, fullFilePath string, hasTimestamp bool
return fileUrl, objectKey return fileUrl, objectKey
} }
func UploadFile(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffer) (string, string, error) { func uploadFile(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffer) (string, string, error) {
storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, provider.Endpoint) storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, provider.Endpoint)
if storageProvider == nil { if storageProvider == nil {
return "", "", fmt.Errorf("the provider type: %s is not supported", provider.Type) return "", "", fmt.Errorf("the provider type: %s is not supported", provider.Type)
@ -67,6 +67,25 @@ func UploadFile(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffe
return fileUrl, objectKey, nil return fileUrl, objectKey, nil
} }
func UploadFileSafe(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffer) (string, string, error) {
var fileUrl string
var objectKey string
var err error
times := 0
for {
fileUrl, objectKey, err = uploadFile(provider, fullFilePath, fileBuffer)
if err != nil {
times += 1
if times >= 5 {
return "", "", err
}
} else {
break
}
}
return fileUrl, objectKey, nil
}
func DeleteFile(provider *Provider, objectKey string) error { func DeleteFile(provider *Provider, objectKey string) error {
storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, provider.Endpoint) storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, provider.Endpoint)
if storageProvider == nil { if storageProvider == nil {

2
object/user.go
View File

@ -246,7 +246,7 @@ func UpdateUser(id string, user *User) bool {
user.UpdateUserHash() user.UpdateUserHash()
if user.Avatar != oldUser.Avatar && user.Avatar != "" { if user.Avatar != oldUser.Avatar && user.Avatar != "" && user.PermanentAvatar != "*" {
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar) user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
} }