Skip to content
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

Check for read key or public key when adding Threads #370

Merged
merged 2 commits into from
Jun 3, 2020
Merged

Check for read key or public key when adding Threads #370

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e77cfe
feat(net): skip check for read key
carsonfarmer Jun 3, 2020
3da8646
fix: add check for logkey OR read perm
carsonfarmer Jun 3, 2020
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
16 changes: 7 additions & 9 deletions net/net.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,15 +271,13 @@ func (n *net) AddThread(ctx context.Context, addr ma.Multiaddr, opts ...core.New
}); err != nil {
return
}
if args.ThreadKey.CanRead() {
var linfo thread.LogInfo
linfo, err = createLog(n.host.ID(), args.LogKey)
if err != nil {
return
}
if err = n.store.AddLog(id, linfo); err != nil {
return
}
var linfo thread.LogInfo
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to avoid creating a log if it won't be used ever, since it will get pushed to the other peers.

linfo, err = createLog(n.host.ID(), args.LogKey)
if err != nil {
return
}
if err = n.store.AddLog(id, linfo); err != nil {
return
}

threadComp, err := ma.NewComponent(thread.Name, id.String())
Expand Down