astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-08-01 08:30:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow event notifications to work without region (#5119)

Browse Source 
Fixes #5101
This commit is contained in:
Harshavardhana
2017-10-27 15:09:55 -07:00
committed by Dee Koder
parent b4ddccc2f7
commit 8bbfb1b714
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/bucket-notification-utils.go
+12 -4
View File
@@ -116,9 +116,13 @@ func checkARN(arn, arnType string) APIErrorCode {
if len(strs) != 6 {
return ErrARNNotification
}
if serverConfig.GetRegion() != "" {
// Server region is allowed to be empty by default,
// in such a scenario ARN region is not validating
// allowing all regions.
if sregion := serverConfig.GetRegion(); sregion != "" {
region := strs[3]
if region != serverConfig.GetRegion() {
if region != sregion {
return ErrRegionNotification
}
}
@@ -273,9 +277,13 @@ func unmarshalSqsARN(queueARN string) (mSqs arnSQS) {
if len(strs) != 6 {
return
}
if serverConfig.GetRegion() != "" {
// Server region is allowed to be empty by default,
// in such a scenario ARN region is not validating
// allowing all regions.
if sregion := serverConfig.GetRegion(); sregion != "" {
region := strs[3]
if region != serverConfig.GetRegion() {
if region != sregion {
return
}
}