public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LDAP: validate organization role during parsing (#37188)

Browse Source 
* LDAP: validate organization role during parsing

* Trigger a new build

* Check if grafana_admin is present
This commit is contained in:
Krzysztof Dąbrowski
2022-05-04 09:35:10 +02:00
committed by GitHub
parent 18f089d1bd
commit c41397a6e7
3 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/models/org_user.go
+5 -9
View File
@@ -1,9 +1,9 @@
package models package models
import ( import (
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"strings"
"time" "time"
) )
@@ -61,18 +61,14 @@ func (r RoleType) Parents() []RoleType {
} }
} }
func (r *RoleType) UnmarshalJSON(data []byte) error { func (r *RoleType) UnmarshalText(data []byte) error {
var str string // make sure "viewer" and "Viewer" are both correct
err := json.Unmarshal(data, &str) str := strings.Title(string(data))
if err != nil {
return err
}
*r = RoleType(str) *r = RoleType(str)
if !r.IsValid() { if !r.IsValid() {
if (*r) != "" { if (*r) != "" {
return fmt.Errorf("JSON validation error: invalid role value: %s", *r) return fmt.Errorf("invalid role value: %s", *r)
} }
*r = ROLE_VIEWER *r = ROLE_VIEWER
pkg/services/ldap/settings.go
+4
View File
@@ -153,6 +153,10 @@ func readConfig(configFile string) (*Config, error) {
} }
for _, groupMap := range server.Groups { for _, groupMap := range server.Groups {
if groupMap.OrgRole == "" && groupMap.IsGrafanaAdmin == nil {
return nil, fmt.Errorf("LDAP group mapping: organization role or grafana admin status is required")
}
if groupMap.OrgId == 0 { if groupMap.OrgId == 0 {
groupMap.OrgId = 1 groupMap.OrgId = 1
} }
public/app/features/admin/ldap/LdapUserGroups.tsx
+15 -25
View File
@@ -33,31 +33,21 @@ export const LdapUserGroups: FC<Props> = ({ groups, showAttributeMapping }) => {
{items.map((group, index) => { {items.map((group, index) => {
return ( return (
<tr key={`${group.orgId}-${index}`}> <tr key={`${group.orgId}-${index}`}>
{showAttributeMapping && ( {showAttributeMapping && <td>{group.groupDN}</td>}
<> {group.orgName && group.orgRole ? <td>{group.orgName}</td> : <td />}
<td>{group.groupDN}</td> {group.orgRole ? (
{!group.orgRole && ( <td>{group.orgRole}</td>
<> ) : (
<td /> <td>
<td> <span className="text-warning">
<span className="text-warning"> No match
No match <Tooltip placement="top" content="No matching groups found" theme={'info'}>
<Tooltip placement="top" content="No matching groups found" theme={'info'}> <span className="gf-form-help-icon">
<span className="gf-form-help-icon"> <Icon name="info-circle" />
<Icon name="info-circle" /> </span>
</span> </Tooltip>
</Tooltip> </span>
</span> </td>
</td>
</>
)}
</>
)}
{group.orgName && (
<>
<td>{group.orgName}</td>
<td>{group.orgRole}</td>
</>
)} )}
</tr> </tr>
); );