You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/09/20 15:55:19 UTC
[GitHub] dg4prez closed pull request #2843: ops and above (admin) should not
have any server fields masked
dg4prez closed pull request #2843: ops and above (admin) should not have any server fields masked
URL: https://github.com/apache/trafficcontrol/pull/2843
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/source/api/v11/server.rst b/docs/source/api/v11/server.rst
index 44f129259..cc2cdd657 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 1f768750d..0d9590c3f 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
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services