From 17baa0cff60ab21ffc3baefc6e26464770df6538 Mon Sep 17 00:00:00 2001 From: Umputun Date: Thu, 1 Aug 2019 01:49:09 -0500 Subject: [PATCH] fix admin.admins call --- backend/_example/memory_store/accessor/admin.go | 2 +- backend/app/cmd/server.go | 2 +- backend/app/store/service/service.go | 1 + backend/nginx-proxy-example.conf | 16 ---------------- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/backend/_example/memory_store/accessor/admin.go b/backend/_example/memory_store/accessor/admin.go index e82ef519..6e375dfd 100644 --- a/backend/_example/memory_store/accessor/admin.go +++ b/backend/_example/memory_store/accessor/admin.go @@ -41,7 +41,7 @@ func (m *MemAdmin) Admins(siteID string) (ids []string, err error) { if !ok { return nil, errors.Errorf("site %s not found", siteID) } - + log.Printf("[DEBUG] admins for %s, %+v", siteID, resp.IDs) return resp.IDs, nil } diff --git a/backend/app/cmd/server.go b/backend/app/cmd/server.go index 5d57e2cc..ffdc5092 100644 --- a/backend/app/cmd/server.go +++ b/backend/app/cmd/server.go @@ -108,7 +108,7 @@ type StoreGroup struct { Path string `long:"path" env:"PATH" default:"./var" description:"parent dir for bolt files"` Timeout time.Duration `long:"timeout" env:"TIMEOUT" default:"30s" description:"bolt timeout"` } `group:"bolt" namespace:"bolt" env-namespace:"BOLT"` - RPC RPCGroup `group:"rpc" namespace:"rpc" env-namespace:"TPC"` + RPC RPCGroup `group:"rpc" namespace:"rpc" env-namespace:"RPC"` } // ImageGroup defines options group for store pictures diff --git a/backend/app/store/service/service.go b/backend/app/store/service/service.go index 937cbd3c..820b37fe 100644 --- a/backend/app/store/service/service.go +++ b/backend/app/store/service/service.go @@ -469,6 +469,7 @@ func (s *DataStore) ValidateComment(c *store.Comment) error { func (s *DataStore) IsAdmin(siteID string, userID string) bool { admins, err := s.AdminStore.Admins(siteID) if err != nil { + log.Printf("[WARN] can't get admins for %s, %v", siteID, err) return false } for _, a := range admins { diff --git a/backend/nginx-proxy-example.conf b/backend/nginx-proxy-example.conf index fabd0ae7..32d96ec3 100644 --- a/backend/nginx-proxy-example.conf +++ b/backend/nginx-proxy-example.conf @@ -14,22 +14,6 @@ server { limit_conn perip 10; location / { - - #CORS - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, OPTIONS'; - add_header Access-Control-Allow-Headers "Content-Type, Authorization, X-Requested-With"; - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, OPTIONS'; - add_header 'Access-Control-Max-Age' 86400; - add_header 'Access-Control-Allow-Credentials' 'true'; - add_header 'Access-Control-Allow-Headers' 'Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; - add_header 'Content-Length' 0; - add_header 'Content-Type' 'text/plain; charset=UTF-8'; - return 204; - } - proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;