self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 18:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ev/512

Browse source
This commit is contained in:
Ev Kontsevoy 2016-11-17 20:29:24 -08:00 committed by GitHub
parent 7fe96513e2 36859a0bc8
commit b481739b80
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -42,7 +42,7 @@ Run
1. `go get github.com/gravitational/teleport`
2. `cd $GOPATH/src/github.com/gravitational/teleport`
3. `make`
3. `CGO_ENABLED=true make`
If the build was successful the binaries are here: `$GOPATH/src/github.com/gravitational/teleport/build`

2
lib/web/web.go
View file

@ -454,7 +454,7 @@ func NewSessionResponse(ctx *SessionContext) (*CreateSessionResponse, error) {
Type: roundtrip.AuthBearer,
Token: webSession.WS.BearerToken,
User: user.WebSessionInfo(),
ExpiresIn: int(time.Now().Sub(webSession.WS.Expires) / time.Second),
ExpiresIn: int(webSession.WS.Expires.Sub(time.Now()) / time.Second),
}, nil
}

3
lib/web/web_test.go
View file

@ -319,6 +319,9 @@ func (s *WebSuite) authPackFromResponse(c *C, re *roundtrip.Response) *authPack
if err != nil {
panic(err)
}
if session.ExpiresIn < 0 {
c.Errorf("expected expiry time to be in the future but got %v", session.ExpiresIn)
}
return &authPack{
user: session.User.GetName(),
session: session,