Skip to content

Fix cozmo tokens #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Joematpal wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix cozmo tokens #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d71ddc1
this just a test
Joematpal Aug 25, 2022
703177c
fix cozmo tokens
Joematpal Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions gateway/tokens.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ type ClientTokenManager struct {
lastUpdatedTokens time.Time `json:"-"`
forceClearFile bool `json:"-"`
limiter *MultiLimiter `json:"-"`
cloudDir string
}

func (ctm *ClientTokenManager) Init() error {
Expand All @@ -73,6 +74,7 @@ func (ctm *ClientTokenManager) Init() error {
rate.NewLimiter(rate.Every(15*time.Minute), 3),
rate.NewLimiter(rate.Every(time.Hour), 6),
)
ctm.cloudDir = "/factory/cloud"
ctm.checkValid = make(chan struct{})
ctm.notifyValid = make(chan struct{})
ctm.updateNowChan = make(chan chan struct{})
Expand Down Expand Up @@ -146,15 +148,20 @@ func (ctm *ClientTokenManager) UpdateTokens() error {
ctm.forceClearFile = false
}
}
id, esn, err := ctm.getIDs()
id, _, err := ctm.getIDs()
if err != nil {
return err
}

commonName, err := ctm.getCertCommonName()
if err != nil {
return fmt.Errorf("get cert common name: %v", err)
}
resp, err := ctm.sendBlock(cloud_clad.NewDocRequestWithRead(&cloud_clad.ReadRequest{
Account: id,
Thing: fmt.Sprintf("vic:%s", esn),
Thing: commonName,
Items: []cloud_clad.ReadItem{
cloud_clad.ReadItem{
{
DocName: "vic.AppTokens",
MyDocVersion: 0,
},
Expand Down Expand Up @@ -199,6 +206,10 @@ func (ctm *ClientTokenManager) getIDs() (string, string, error) {
return user.UserId, esn, nil
}

func (ctm *ClientTokenManager) getCertCommonName() (string, error) {
return robot.CertCommonName(ctm.cloudDir)
}

func (ctm *ClientTokenManager) sendBlock(request *cloud_clad.DocRequest) (*cloud_clad.DocResponse, error) {
// Write the request
var err error
Expand Down
5 changes: 0 additions & 5 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ github.com/dgrijalva/jwt-go v3.2.1-0.20180719211823-0b96aaa70776+incompatible/go
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/digital-dream-labs/api v0.0.0-20210824232136-8cc90c1bb12c h1:ITlFplPHfe+S0uyObyWo/bndO5RIYA9E3OPlBjOTb5Q=
github.com/digital-dream-labs/api v0.0.0-20210824232136-8cc90c1bb12c/go.mod h1:WNiZyUz2m0GppMJuwVvaLvtmC5mVM+YhcrxHBktqjr0=
github.com/digital-dream-labs/api-clients v0.0.0-20210827163254-ba4df2ea97f2 h1:/9fnz/lGTEmF+oTTL2RT6DS8jwLTNMx4KeIXLQCl04M=
github.com/digital-dream-labs/api-clients v0.0.0-20210827163254-ba4df2ea97f2/go.mod h1:Brz2N9V2v1mpLQRI/bdVfuAUpQ2AF/tM1D8DVa9hibQ=
github.com/digital-dream-labs/api-clients v0.0.0-20210830180812-99d038d08a9d h1:A7Tk6UfpHvczFgYe6o1yJpHLdu5d4L8lLJTERDXHdjs=
github.com/digital-dream-labs/api-clients v0.0.0-20210830180812-99d038d08a9d/go.mod h1:Brz2N9V2v1mpLQRI/bdVfuAUpQ2AF/tM1D8DVa9hibQ=
github.com/digital-dream-labs/hugh v0.0.0-20201230195335-18bf4b22cf9d h1:MvlmT9kqwgbtSTRl4SXoYveb9jpLmqFHhE31/6Wg8Hg=
Expand Down Expand Up @@ -132,7 +130,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsouza/go-dockerclient v1.6.6 h1:9e3xkBrVkPb81gzYq23i7iDUEd6sx2ooeJA/gnYU6R4=
github.com/fsouza/go-dockerclient v1.6.6/go.mod h1:3/oRIWoe7uT6bwtAayj/EmJmepBjeL4pYvt7ZxC7Rnk=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
Expand Down Expand Up @@ -701,8 +698,6 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20200923140941-5646d36feee1/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210824181836-a4879c3d0e89/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
google.golang.org/genproto v0.0.0-20210825212027-de86158e7fda h1:iT5uhT54PtbqUsWddv/nnEWdE5e/MTr+Nv3vjxlBP1A=
google.golang.org/genproto v0.0.0-20210825212027-de86158e7fda/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
google.golang.org/genproto v0.0.0-20210830153122-0bac4d21c8ea h1:5eMUso2GVOxypVH1fR4oKgDobrvi4DHctJ4fVk66s/4=
google.golang.org/genproto v0.0.0-20210830153122-0bac4d21c8ea/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
Expand Down