trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgeli...@apache.org
Subject [trafficcontrol] branch 3.0.x updated: ops and above (admin) should not have any server fields masked
Date Thu, 20 Sep 2018 15:55:22 GMT
This is an automated email from the ASF dual-hosted git repository.

dgelinas pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/3.0.x by this push:
     new 75f8a9a  ops and above (admin) should not have any server fields masked
75f8a9a is described below

commit 75f8a9a192c2bb069c19470cf5231292b623cf33
Author: Jeremy Mitchell <mitchell852@gmail.com>
AuthorDate: Wed Sep 19 16:03:37 2018 -0600

    ops and above (admin) should not have any server fields masked
    
    (cherry picked from commit 94d2e2c8388850b44145522794c2b15f76c3a656)
---
 docs/source/api/v11/server.rst                   | 6 +++---
 traffic_ops/traffic_ops_golang/server/servers.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/source/api/v11/server.rst b/docs/source/api/v11/server.rst
index 44f1292..cc2cdd6 100644
--- a/docs/source/api/v11/server.rst
+++ b/docs/source/api/v11/server.rst
@@ -72,7 +72,7 @@ Server
   +--------------------+--------+------------------------------------------------------------------------------------------------------------+
   | ``iloIpNetmask``   | string | The IPv4 netmask of the lights-out-management port.   
                                                    |
   +--------------------+--------+------------------------------------------------------------------------------------------------------------+
-  | ``iloPassword``    | string | The password of the of the lights-out-management user (displays
as ****** unless you are an 'admin' user). |
+  | ``iloPassword``    | string | The password of the of the lights-out-management user (displays
as ****** unless 'ops' / 'admin' user).    |
   +--------------------+--------+------------------------------------------------------------------------------------------------------------+
   | ``iloUsername``    | string | The user name for lights-out-management.              
                                                    |
   +--------------------+--------+------------------------------------------------------------------------------------------------------------+
@@ -228,7 +228,7 @@ Server
   +--------------------+--------+------------------------------------------------------------------------------------------------------------+
   | ``iloIpNetmask``   | string | The IPv4 netmask of the lights-out-management port.   
                                                    |
   +--------------------+--------+------------------------------------------------------------------------------------------------------------+
-  | ``iloPassword``    | string | The password of the of the lights-out-management user (displays
as ****** unless you are an 'admin' user). |
+  | ``iloPassword``    | string | The password of the of the lights-out-management user (displays
as ****** unless 'ops' / 'admin' user).    |
   +--------------------+--------+------------------------------------------------------------------------------------------------------------+
   | ``iloUsername``    | string | The user name for lights-out-management.              
                                                    |
   +--------------------+--------+------------------------------------------------------------------------------------------------------------+
@@ -422,7 +422,7 @@ Server
   +----------------------+--------+-------------------------------------------------------------------------------------------------------------+
   | ``iloIpNetmask``     | string | The IPv4 netmask of the lights-out-management port. 
                                                       |
   +----------------------+--------+-------------------------------------------------------------------------------------------------------------+
-  | ``iloPassword``      | string | The password of the of the lights-out-management user
 (displays as ****** unless you are an 'admin' user). |
+  | ``iloPassword``      | string | The password of the of the lights-out-management user
(displays as ****** unless 'ops' / 'admin' user).     |
   +----------------------+--------+-------------------------------------------------------------------------------------------------------------+
   | ``iloUsername``      | string | The user name for lights-out-management.            
                                                       |
   +----------------------+--------+-------------------------------------------------------------------------------------------------------------+
diff --git a/traffic_ops/traffic_ops_golang/server/servers.go b/traffic_ops/traffic_ops_golang/server/servers.go
index 1f76875..0d9590c 100644
--- a/traffic_ops/traffic_ops_golang/server/servers.go
+++ b/traffic_ops/traffic_ops_golang/server/servers.go
@@ -270,7 +270,7 @@ FULL OUTER JOIN deliveryservice_server dss ON dss.server = s.id
 		if err = rows.StructScan(&s); err != nil {
 			return nil, []error{fmt.Errorf("getting servers: %v", err)}, tc.SystemError
 		}
-		if user.PrivLevel < auth.PrivLevelAdmin {
+		if user.PrivLevel < auth.PrivLevelOperations {
 			s.ILOPassword = &HiddenField
 			s.XMPPPasswd = &HiddenField
 		}


Mime
View raw message