Skip to content

fix(accounts1): authorize group info D-Bus methods to prevent info leak #1196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhduiy wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −6
Open

fix(accounts1): authorize group info D-Bus methods to prevent info leak #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion accounts1/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func NewManager(service *dbusutil.Service) *Manager {
}
}

m.GroupList, _ = m.GetGroups()
m.GroupList, _ = users.GetAllGroups()
m.watcher = dutils.NewWatchProxy()
if m.watcher != nil {
m.delayTaskManager = tasker.NewDelayTaskManager()
Expand Down
18 changes: 13 additions & 5 deletions accounts1/manager_ifc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,20 @@ func (m *Manager) IsPasswordValid(password string) (valid bool, msg string, code
return errCode.IsOk(), errCode.Prompt(), int32(errCode), nil
}

func (m *Manager) GetGroups() (groups []string, busErr *dbus.Error) {
func (m *Manager) GetGroups(sender dbus.Sender) (groups []string, busErr *dbus.Error) {
if err := m.checkAuth(sender); err != nil {
logger.Debug("[GetGroups] access denied:", err)
return nil, dbusutil.ToError(err)
}
groups, err := users.GetAllGroups()
return groups, dbusutil.ToError(err)
}

func (m *Manager) GetGroupInfoByName(name string) (groupInfo string, busErr *dbus.Error) {
func (m *Manager) GetGroupInfoByName(sender dbus.Sender, name string) (groupInfo string, busErr *dbus.Error) {
if err := m.checkAuth(sender); err != nil {
logger.Debug("[GetGroupInfoByName] access denied:", err)
return "", dbusutil.ToError(err)
}
info, err := users.GetGroupByName(name)
if err != nil {
logger.Warning(err)
Expand Down Expand Up @@ -447,7 +455,7 @@ func (m *Manager) CreateGroup(sender dbus.Sender, groupName string, gid uint32,
logger.Warning(err)
return dbusutil.ToError(err)
}
groupList, _ := m.GetGroups()
groupList, _ := users.GetAllGroups()
m.setPropGroupList(groupList)
return nil
}
Expand Down Expand Up @@ -475,7 +483,7 @@ func (m *Manager) DeleteGroup(sender dbus.Sender, groupName string, force bool)
logger.Warning(err)
return dbusutil.ToError(err)
}
groupList, _ := m.GetGroups()
groupList, _ := users.GetAllGroups()
m.setPropGroupList(groupList)
return nil
}
Expand Down Expand Up @@ -513,7 +521,7 @@ func (m *Manager) ModifyGroup(sender dbus.Sender, currentGroupName string, newGr
logger.Warning(err)
return dbusutil.ToError(err)
}
groupList, _ := m.GetGroups()
groupList, _ := users.GetAllGroups()
m.setPropGroupList(groupList)
return nil
}
Expand Down
Loading