Merge e0182b85e0 into de234b888c

cmd/admin-handlers-users.go

@@ -1827,16 +1827,18 @@ func (a adminAPIHandlers) SetPolicyForUserOrGroup(w http.ResponseWriter, r *http
 				iamLogIf(ctx, err)
 			} else if foundGroupDN == nil || !underBaseDN {
 				err = errNoSuchGroup
+			} else {
+				entityName = foundGroupDN.NormDN
 			}
-			entityName = foundGroupDN.NormDN
 		} else {
 			var foundUserDN *xldap.DNSearchResult
 			if foundUserDN, err = globalIAMSys.LDAPConfig.GetValidatedDNForUsername(entityName); err != nil {
 				iamLogIf(ctx, err)
 			} else if foundUserDN == nil {
 				err = errNoSuchUser
+			} else {
+				entityName = foundUserDN.NormDN
 			}
-			entityName = foundUserDN.NormDN
 		}
 		if err != nil {
 			writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)

cmd/config-current.go

@@ -524,6 +524,7 @@ func lookupConfigs(s config.Config, objAPI ObjectLayer) {
 		configLogIf(ctx, fmt.Errorf("Invalid site configuration: %w", err))
 	}
 	globalSite.Update(siteCfg)
+	xhttp.SetSiteName(globalSite.Name())
 
 	globalAutoEncryption = crypto.LookupAutoEncryption() // Enable auto-encryption if enabled
 	if globalAutoEncryption && GlobalKMS == nil {

internal/http/server.go

@@ -37,6 +37,9 @@ var (
 
 	// GlobalDeploymentID - is sent in the header to all http targets
 	GlobalDeploymentID string
+
+	// GlobalSiteName - is sent in the header to all http targets
+	GlobalSiteName string
 )
 
 const (
@@ -236,3 +239,8 @@ func SetMinIOVersion(version string) {
 func SetDeploymentID(deploymentID string) {
 	GlobalDeploymentID = deploymentID
 }
+
+// SetSiteName -- user defined site from environment variable `MINIO_SITE_NAME` or from configuration `site.name`
+func SetSiteName(siteName string) {
+	GlobalSiteName = siteName
+}

internal/logger/audit.go

@@ -52,6 +52,7 @@ func GetAuditEntry(ctx context.Context) *audit.Entry {
 		r = &audit.Entry{
 			Version:      internalAudit.Version,
 			DeploymentID: xhttp.GlobalDeploymentID,
+			SiteName:     xhttp.GlobalSiteName,
 			Time:         time.Now().UTC(),
 		}
 		return r

internal/logger/message/audit/entry.go

@@ -36,6 +36,7 @@ func NewEntry(deploymentID string) audit.Entry {
 	return audit.Entry{
 		Version:      Version,
 		DeploymentID: deploymentID,
+		SiteName:     xhttp.GlobalSiteName,
 		Time:         time.Now().UTC(),
 	}
 }