From 2ead9b931e2b66767b0587b4f2f744f0b381a154 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Fri, 29 Jul 2022 14:39:39 -0700 Subject: [PATCH] more golint cleanup --- net/server/internal/api_getNodeConfig.go | 1 + net/server/internal/api_getNodeStatus.go | 1 + net/server/internal/api_getOpenMessage.go | 1 + net/server/internal/api_getProfile.go | 1 + net/server/internal/api_getProfileImage.go | 1 + net/server/internal/api_getProfileMessage.go | 1 + net/server/internal/api_removeAccount.go | 1 + net/server/internal/api_removeArticle.go | 1 + net/server/internal/api_removeCard.go | 1 + net/server/internal/api_removeChannel.go | 1 + net/server/internal/api_removeChannelTopic.go | 1 + net/server/internal/api_removeChannelTopicAsset.go | 1 + net/server/internal/api_removeChannelTopicTag.go | 9 +++++---- net/server/internal/api_removeGroup.go | 1 + net/server/internal/api_removeNodeAccount.go | 1 + 15 files changed, 19 insertions(+), 4 deletions(-) diff --git a/net/server/internal/api_getNodeConfig.go b/net/server/internal/api_getNodeConfig.go index 8e0b10c4..2bee9ca9 100644 --- a/net/server/internal/api_getNodeConfig.go +++ b/net/server/internal/api_getNodeConfig.go @@ -4,6 +4,7 @@ import ( "net/http" ) +//GetNodeConfig retreive current admin config func GetNodeConfig(w http.ResponseWriter, r *http.Request) { // validate login diff --git a/net/server/internal/api_getNodeStatus.go b/net/server/internal/api_getNodeStatus.go index d508aab4..a31f6ada 100644 --- a/net/server/internal/api_getNodeStatus.go +++ b/net/server/internal/api_getNodeStatus.go @@ -7,6 +7,7 @@ import ( "net/http" ) +//GetNodeStatus query if node admin token has been set func GetNodeStatus(w http.ResponseWriter, r *http.Request) { var config store.Config err := store.DB.Where("config_id = ?", CNFConfigured).First(&config).Error diff --git a/net/server/internal/api_getOpenMessage.go b/net/server/internal/api_getOpenMessage.go index 03af54a5..dd9ce452 100644 --- a/net/server/internal/api_getOpenMessage.go +++ b/net/server/internal/api_getOpenMessage.go @@ -8,6 +8,7 @@ import ( "net/http" ) +//GetOpenMessage retrieve message to deliver to contact for connection func GetOpenMessage(w http.ResponseWriter, r *http.Request) { account, code, res := ParamAgentToken(r, true) diff --git a/net/server/internal/api_getProfile.go b/net/server/internal/api_getProfile.go index e381682d..b155c8c8 100644 --- a/net/server/internal/api_getProfile.go +++ b/net/server/internal/api_getProfile.go @@ -4,6 +4,7 @@ import ( "net/http" ) +//GetProfile retrieve public profile of account holder func GetProfile(w http.ResponseWriter, r *http.Request) { account, code, err := ParamAgentToken(r, true) diff --git a/net/server/internal/api_getProfileImage.go b/net/server/internal/api_getProfileImage.go index df3829fd..ecbf9b26 100644 --- a/net/server/internal/api_getProfileImage.go +++ b/net/server/internal/api_getProfileImage.go @@ -8,6 +8,7 @@ import ( "time" ) +//GetProfileImage retreive profile image for account holder func GetProfileImage(w http.ResponseWriter, r *http.Request) { var data []byte diff --git a/net/server/internal/api_getProfileMessage.go b/net/server/internal/api_getProfileMessage.go index 84633b88..199fcad2 100644 --- a/net/server/internal/api_getProfileMessage.go +++ b/net/server/internal/api_getProfileMessage.go @@ -6,6 +6,7 @@ import ( "net/http" ) +//GetProfileMessage get data message for sending profile to federated node func GetProfileMessage(w http.ResponseWriter, r *http.Request) { var code int var err error diff --git a/net/server/internal/api_removeAccount.go b/net/server/internal/api_removeAccount.go index 967a0970..4a67c5b1 100644 --- a/net/server/internal/api_removeAccount.go +++ b/net/server/internal/api_removeAccount.go @@ -7,6 +7,7 @@ import ( "os" ) +//RemoveAccount removes owners account func RemoveAccount(w http.ResponseWriter, r *http.Request) { account, err := AccountLogin(r) diff --git a/net/server/internal/api_removeArticle.go b/net/server/internal/api_removeArticle.go index ac539673..b21023ae 100644 --- a/net/server/internal/api_removeArticle.go +++ b/net/server/internal/api_removeArticle.go @@ -8,6 +8,7 @@ import ( "net/http" ) +//RemoveArticle removes article from account func RemoveArticle(w http.ResponseWriter, r *http.Request) { account, code, err := ParamAgentToken(r, false) diff --git a/net/server/internal/api_removeCard.go b/net/server/internal/api_removeCard.go index 99a85061..d4a3cb79 100644 --- a/net/server/internal/api_removeCard.go +++ b/net/server/internal/api_removeCard.go @@ -8,6 +8,7 @@ import ( "net/http" ) +//RemoveCard removes card from account func RemoveCard(w http.ResponseWriter, r *http.Request) { account, code, err := ParamAgentToken(r, false) diff --git a/net/server/internal/api_removeChannel.go b/net/server/internal/api_removeChannel.go index fe05a652..9f1661f2 100644 --- a/net/server/internal/api_removeChannel.go +++ b/net/server/internal/api_removeChannel.go @@ -8,6 +8,7 @@ import ( "net/http" ) +//RemoveChannel removes channel from account func RemoveChannel(w http.ResponseWriter, r *http.Request) { var err error var code int diff --git a/net/server/internal/api_removeChannelTopic.go b/net/server/internal/api_removeChannelTopic.go index 66f9c5e7..66c187a9 100644 --- a/net/server/internal/api_removeChannelTopic.go +++ b/net/server/internal/api_removeChannelTopic.go @@ -8,6 +8,7 @@ import ( "net/http" ) +//Removes channel topic created by invoker or under invokers channel func RemoveChannelTopic(w http.ResponseWriter, r *http.Request) { // scan parameters diff --git a/net/server/internal/api_removeChannelTopicAsset.go b/net/server/internal/api_removeChannelTopicAsset.go index d0d18f5b..8c6e00d5 100644 --- a/net/server/internal/api_removeChannelTopicAsset.go +++ b/net/server/internal/api_removeChannelTopicAsset.go @@ -8,6 +8,7 @@ import ( "net/http" ) +//RemoveChannelTopic removes topic asset if invoker created topic func RemoveChannelTopicAsset(w http.ResponseWriter, r *http.Request) { // scan parameters diff --git a/net/server/internal/api_removeChannelTopicTag.go b/net/server/internal/api_removeChannelTopicTag.go index 8d1668c2..168c8dbf 100644 --- a/net/server/internal/api_removeChannelTopicTag.go +++ b/net/server/internal/api_removeChannelTopicTag.go @@ -8,6 +8,7 @@ import ( "net/http" ) +//RemoveChannelTopicTag removes tag from topic func RemoveChannelTopicTag(w http.ResponseWriter, r *http.Request) { // scan parameters @@ -60,10 +61,10 @@ func RemoveChannelTopicTag(w http.ResponseWriter, r *http.Request) { } // check permission - if tag.GUID != guid { - ErrResponse(w, http.StatusUnauthorized, errors.New("not creator of tag")) - return - } + if act.GUID != guid && topicSlot.Topic.GUID != guid { + ErrResponse(w, http.StatusUnauthorized, errors.New("not creator of topic or host")) + return + } err = store.DB.Transaction(func(tx *gorm.DB) error { diff --git a/net/server/internal/api_removeGroup.go b/net/server/internal/api_removeGroup.go index 8d9e0ebb..68c4240e 100644 --- a/net/server/internal/api_removeGroup.go +++ b/net/server/internal/api_removeGroup.go @@ -8,6 +8,7 @@ import ( "net/http" ) +//RemoveGroup removes group from account func RemoveGroup(w http.ResponseWriter, r *http.Request) { account, code, err := ParamAgentToken(r, true) diff --git a/net/server/internal/api_removeNodeAccount.go b/net/server/internal/api_removeNodeAccount.go index c622c625..e0c6c3c1 100644 --- a/net/server/internal/api_removeNodeAccount.go +++ b/net/server/internal/api_removeNodeAccount.go @@ -10,6 +10,7 @@ import ( "strconv" ) +//RemoveNodeAccount deletes account on behalf of admin func RemoveNodeAccount(w http.ResponseWriter, r *http.Request) { // get referenced account id