Merge pull request #78180 from dougm/vsphere-token-auth-godeps

Backport of #78137: godeps: update vmware/govmomi to v0.20.1
pull/564/head
Kubernetes Prow Robot 2019-06-04 10:02:05 -07:00 committed by GitHub
commit 5c102a465a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 71 additions and 68 deletions

132
Godeps/Godeps.json generated
View File

@ -3319,168 +3319,168 @@
},
{
"ImportPath": "github.com/vmware/govmomi",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/find",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/list",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/lookup",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/lookup/methods",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/lookup/simulator",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/lookup/types",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/nfc",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/object",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/pbm",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/pbm/methods",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/pbm/types",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/property",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/session",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/simulator",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/simulator/esx",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/simulator/vpx",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/sts",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/sts/internal",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/sts/simulator",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/task",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vapi/internal",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vapi/rest",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vapi/simulator",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vapi/tags",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vim25",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vim25/debug",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vim25/methods",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vim25/mo",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vim25/progress",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vim25/soap",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vim25/types",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/govmomi/vim25/xml",
"Comment": "v0.20.0",
"Rev": "bdf05b6cab86b1e9f40ee80a4d2cb07a0c25ef78"
"Comment": "v0.20.1",
"Rev": "4514987f2ddb8875c44cff1d5a24c59425fa6b92"
},
{
"ImportPath": "github.com/vmware/photon-controller-go-sdk/SSPI",

View File

@ -265,8 +265,11 @@ func (s *Signer) SignRequest(req *http.Request) error {
}
bhash := sha256.New().Sum(body)
// Port in the signature must be that of the reverse proxy port, vCenter's default is port 80
port := "80" // TODO: get from lookup service
port := req.URL.Port()
if port == "" {
port = "80" // Default port for the "Host" header on the server side
}
var buf bytes.Buffer
msg := []string{
nonce,