You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2018/07/04 02:39:30 UTC
[trafficcontrol] 05/15: remove nested tenancy check from
deliveryservice request read method
This is an automated email from the ASF dual-hosted git repository.
dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 70fe7c02a8f7823fe3a44902cc3696fc9cd0dd35
Author: Dylan Volz <Dy...@comcast.com>
AuthorDate: Tue Jun 26 20:50:57 2018 -0600
remove nested tenancy check from deliveryservice request read method
---
.../deliveryservice/deliveryservicesv12.go | 2 +-
.../deliveryservice/deliveryservicesv13.go | 4 ++--
.../deliveryservice/request/requests.go | 20 ++++++++++----------
traffic_ops/traffic_ops_golang/tenant/tenancy.go | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
index aa0d36a..dd2d3cc 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
@@ -216,7 +216,7 @@ func CreateV12() http.HandlerFunc {
func(ds *TODeliveryServiceV12) Read(params map[string]string) ([]interface{}, []error, tc.ApiErrorType) {
returnable := []interface{}{}
- dses, errs, errType := readGetDeliveryServices(params, ds.ReqInfo.Tx, *ds.ReqInfo.User)
+ dses, errs, errType := readGetDeliveryServices(params, ds.ReqInfo.Tx, ds.ReqInfo.User)
if len(errs) > 0 {
for _, err := range errs {
if err.Error() == `id cannot parse to integer` {
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
index 23d9d01..10d3182 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
@@ -248,7 +248,7 @@ func create(tx *sql.Tx, cfg config.Config, user *auth.CurrentUser, ds tc.Deliver
func (ds *TODeliveryServiceV13) Read(params map[string]string) ([]interface{}, []error, tc.ApiErrorType) {
returnable := []interface{}{}
- dses, errs, errType := readGetDeliveryServices(params, ds.ReqInfo.Tx, *ds.ReqInfo.User)
+ dses, errs, errType := readGetDeliveryServices(params, ds.ReqInfo.Tx, ds.ReqInfo.User)
if len(errs) > 0 {
for _, err := range errs {
if err.Error() == `id cannot parse to integer` { // TODO create const for string
@@ -603,7 +603,7 @@ func filterAuthorized(dses []tc.DeliveryServiceNullableV13, user *auth.CurrentUs
return newDSes, nil
}
-func readGetDeliveryServices(params map[string]string, tx *sqlx.Tx, user auth.CurrentUser) ([]tc.DeliveryServiceNullableV13, []error, tc.ApiErrorType) {
+func readGetDeliveryServices(params map[string]string, tx *sqlx.Tx, user *auth.CurrentUser) ([]tc.DeliveryServiceNullableV13, []error, tc.ApiErrorType) {
if strings.HasSuffix(params["id"], ".json") {
params["id"] = params["id"][:len(params["id"])-len(".json")]
}
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/requests.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/requests.go
index 00a3d9d..8ac9f2b 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/request/requests.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/requests.go
@@ -102,6 +102,15 @@ func (req *TODeliveryServiceRequest) Read(parameters map[string]string) ([]inter
if len(errs) > 0 {
return nil, errs, tc.DataConflictError
}
+ if tenant.IsTenancyEnabledTx(req.ReqInfo.Tx) {
+ log.Debugln("Tenancy is enabled")
+ tenantIDs, err := tenant.GetUserTenantIDListTx(req.ReqInfo.User, req.ReqInfo.Tx)
+ if err != nil {
+ log.Errorln("received error querying for user's tenants: " + err.Error())
+ return nil, []error{tc.DBError}, tc.SystemError
+ }
+ where, queryValues = dbhelpers.AddTenancyCheck(where, queryValues, "r.deliveryservice->>'tenantId", tenantIDs)
+ }
query := selectDeliveryServiceRequestsQuery() + where + orderBy
log.Debugln("Query is ", query)
@@ -120,16 +129,7 @@ func (req *TODeliveryServiceRequest) Read(parameters map[string]string) ([]inter
log.Errorf("error parsing DeliveryServiceRequest rows: %v", err)
return nil, []error{tc.DBError}, tc.SystemError
}
-
- // TODO: combine tenancy with the query above so there's a single db call
- t, err := s.IsTenantAuthorized(req.ReqInfo.User)
- if err != nil {
- log.Errorf("error checking tenancy: %v", err)
- return nil, []error{tc.DBError}, tc.SystemError
- }
- if t {
- deliveryServiceRequests = append(deliveryServiceRequests, s)
- }
+ deliveryServiceRequests = append(deliveryServiceRequests, s)
}
return deliveryServiceRequests, []error{}, tc.NoError
diff --git a/traffic_ops/traffic_ops_golang/tenant/tenancy.go b/traffic_ops/traffic_ops_golang/tenant/tenancy.go
index fad4cdc..ea6d5ce 100644
--- a/traffic_ops/traffic_ops_golang/tenant/tenancy.go
+++ b/traffic_ops/traffic_ops_golang/tenant/tenancy.go
@@ -183,7 +183,7 @@ func GetUserTenantIDList(user auth.CurrentUser, db *sqlx.DB) ([]int, error) {
return tenants, nil
}
-func GetUserTenantIDListTx(user auth.CurrentUser, tx *sqlx.Tx) ([]int, error) {
+func GetUserTenantIDListTx(user *auth.CurrentUser, tx *sqlx.Tx) ([]int, error) {
query := `WITH RECURSIVE q AS (SELECT id, name, active, parent_id FROM tenant WHERE id = $1
UNION SELECT t.id, t.name, t.active, t.parent_id FROM tenant t JOIN q ON q.id = t.parent_id)
SELECT id FROM q;`