diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go index 601c0f7a8..53de73673 100644 --- a/services/socketwrap/clientManager.go +++ b/services/socketwrap/clientManager.go @@ -50,7 +50,7 @@ func (h *ClientsManager) Run() { } case message := <-models.ActionChan: if isInOpTypes(opTypes, message.OpType) { - message.Comment = nil + filterUserPrivateInfo(message) LastActionsQueue.Push(message) for _, client := range h.Clients.Keys() { select { @@ -95,6 +95,7 @@ func initActionQueue() { user, err := models.GetUserByID(actions[i].UserID) if err == nil { if !user.IsOrganization() { + filterUserPrivateInfo(actions[i]) LastActionsQueue.Push(actions[i]) } @@ -103,3 +104,19 @@ func initActionQueue() { } } } + +func filterUserPrivateInfo(action *models.Action) { + action.Comment = nil + action.ActUser.Email = "" + action.ActUser.Passwd = "" + action.ActUser.PasswdHashAlgo = "" + action.ActUser.PrivateKey = "" + action.ActUser.PublicKey = "" + action.ActUser.Salt = "" + action.ActUser.FullName = "" + action.ActUser.AvatarEmail = "" + action.ActUser.IsAdmin = false + action.ActUser.EmailNotificationsPreference = "" + action.ActUser.IsOperator = false + +} diff --git a/templates/explore/repo_orgtop.tmpl b/templates/explore/repo_orgtop.tmpl index c2865d7c8..d9c29fd54 100755 --- a/templates/explore/repo_orgtop.tmpl +++ b/templates/explore/repo_orgtop.tmpl @@ -1,5 +1,6 @@ - - + + +