From ca9c68d49570a0869cc1e93b99813f350665c6ae Mon Sep 17 00:00:00 2001 From: Mike Maxim Date: Thu, 3 Jan 2019 13:37:21 -0500 Subject: [PATCH] drop LookupIDUntrusted since it messes up SBS sometimes CORE-9786 (#15290) --- go/chat/convsource_test.go | 5 ----- go/chat/inboxsource.go | 10 +++++----- go/chat/teams.go | 37 ------------------------------------- go/chat/tlf.go | 11 ----------- go/chat/types/interfaces.go | 3 +-- go/chat/types/types.go | 5 ----- go/kbtest/chat.go | 11 ----------- 7 files changed, 6 insertions(+), 76 deletions(-) diff --git a/go/chat/convsource_test.go b/go/chat/convsource_test.go index a1eea0c16bd8..135840e2fecc 100644 --- a/go/chat/convsource_test.go +++ b/go/chat/convsource_test.go @@ -733,11 +733,6 @@ func (f failingTlf) CompleteAndCanonicalizePrivateTlfName(context.Context, strin return keybase1.CanonicalTLFNameAndIDWithBreaks{}, nil } -func (f failingTlf) LookupIDUntrusted(context.Context, string, bool) (res types.NameInfoUntrusted, err error) { - require.Fail(f.t, "LookupUnstrusted call") - return res, err -} - func (f failingTlf) LookupID(context.Context, string, bool) (res types.NameInfo, err error) { require.Fail(f.t, "Lookup call") return res, err diff --git a/go/chat/inboxsource.go b/go/chat/inboxsource.go index 380a37135166..bb3aad8b5d75 100644 --- a/go/chat/inboxsource.go +++ b/go/chat/inboxsource.go @@ -18,7 +18,7 @@ import ( ) func filterConvLocals(convLocals []chat1.ConversationLocal, rquery *chat1.GetInboxQuery, - query *chat1.GetInboxLocalQuery, nameInfo types.NameInfoUntrusted) (res []chat1.ConversationLocal, err error) { + query *chat1.GetInboxLocalQuery, nameInfo types.NameInfo) (res []chat1.ConversationLocal, err error) { for _, convLocal := range convLocals { if rquery != nil && rquery.TlfID != nil { @@ -99,7 +99,7 @@ func (b *baseInboxSource) SetRemoteInterface(ri func() chat1.RemoteInterface) { } func (b *baseInboxSource) GetInboxQueryLocalToRemote(ctx context.Context, - lquery *chat1.GetInboxLocalQuery) (rquery *chat1.GetInboxQuery, info types.NameInfoUntrusted, err error) { + lquery *chat1.GetInboxLocalQuery) (rquery *chat1.GetInboxQuery, info types.NameInfo, err error) { if lquery == nil { return nil, info, nil @@ -110,7 +110,7 @@ func (b *baseInboxSource) GetInboxQueryLocalToRemote(ctx context.Context, var err error tlfName := utils.AddUserToTLFName(b.G(), lquery.Name.Name, lquery.Visibility(), lquery.Name.MembersType) - info, err = CreateNameInfoSource(ctx, b.G(), lquery.Name.MembersType).LookupIDUntrusted(ctx, tlfName, + info, err = CreateNameInfoSource(ctx, b.G(), lquery.Name.MembersType).LookupID(ctx, tlfName, lquery.Visibility() == keybase1.TLFVisibility_PUBLIC) if err != nil { b.Debug(ctx, "GetInboxQueryLocalToRemote: failed: %s", err) @@ -211,11 +211,11 @@ func (b *baseInboxSource) Disconnected(ctx context.Context) { } func GetInboxQueryNameInfo(ctx context.Context, g *globals.Context, - lquery *chat1.GetInboxLocalQuery) (res types.NameInfoUntrusted, err error) { + lquery *chat1.GetInboxLocalQuery) (res types.NameInfo, err error) { if lquery.Name == nil || len(lquery.Name.Name) == 0 { return res, errors.New("invalid name query") } - return CreateNameInfoSource(ctx, g, lquery.Name.MembersType).LookupIDUntrusted(ctx, lquery.Name.Name, + return CreateNameInfoSource(ctx, g, lquery.Name.MembersType).LookupID(ctx, lquery.Name.Name, lquery.Visibility() == keybase1.TLFVisibility_PUBLIC) } diff --git a/go/chat/teams.go b/go/chat/teams.go index 041e19fa260c..bd38d692dc0e 100644 --- a/go/chat/teams.go +++ b/go/chat/teams.go @@ -294,21 +294,6 @@ func NewTeamsNameInfoSource(g *globals.Context) *TeamsNameInfoSource { } } -func (t *TeamsNameInfoSource) LookupIDUntrusted(ctx context.Context, name string, public bool) (res types.NameInfoUntrusted, err error) { - teamName, err := keybase1.TeamNameFromString(name) - if err != nil { - return res, err - } - kid, err := t.G().GetTeamLoader().ResolveNameToIDUntrusted(ctx, teamName, public, true) - if err != nil { - return res, err - } - return types.NameInfoUntrusted{ - ID: chat1.TLFID(kid.ToBytes()), - CanonicalName: teamName.String(), - }, nil -} - func (t *TeamsNameInfoSource) LookupID(ctx context.Context, name string, public bool) (res types.NameInfo, err error) { defer t.Trace(ctx, func() error { return err }, fmt.Sprintf("LookupID(%s)", name))() @@ -588,28 +573,6 @@ func (t *ImplicitTeamsNameInfoSource) transformTeamDoesNotExist(ctx context.Cont } } -func (t *ImplicitTeamsNameInfoSource) LookupIDUntrusted(ctx context.Context, name string, public bool) (res types.NameInfoUntrusted, err error) { - defer func() { err = t.transformTeamDoesNotExist(ctx, err, name) }() - impTeamName, err := teams.ResolveImplicitTeamDisplayName(ctx, t.G().ExternalG(), name, public) - if err != nil { - return res, err - } - kid, err := teams.LookupImplicitTeamIDUntrusted(ctx, t.G().ExternalG(), name, public) - if err != nil { - return res, err - } - tlfID := chat1.TLFID(kid.ToBytes()) - if t.lookupUpgraded { - if tlfID, err = tlfIDToTeamID.LookupTLFID(ctx, kid, t.G().GetAPI()); err != nil { - return res, err - } - } - return types.NameInfoUntrusted{ - ID: tlfID, - CanonicalName: impTeamName.String(), - }, nil -} - func (t *ImplicitTeamsNameInfoSource) LookupID(ctx context.Context, name string, public bool) (res types.NameInfo, err error) { defer t.Trace(ctx, func() error { return err }, fmt.Sprintf("LookupID(%s)", name))() // check if name is prefixed diff --git a/go/chat/tlf.go b/go/chat/tlf.go index 42d03a7e8845..6af1f74e67a7 100644 --- a/go/chat/tlf.go +++ b/go/chat/tlf.go @@ -49,17 +49,6 @@ func (t *KBFSNameInfoSource) tlfKeysClient() (*keybase1.TlfKeysClient, error) { }, nil } -func (t *KBFSNameInfoSource) LookupIDUntrusted(ctx context.Context, name string, public bool) (res types.NameInfoUntrusted, err error) { - ni, err := t.LookupID(ctx, name, public) - if err != nil { - return res, err - } - return types.NameInfoUntrusted{ - ID: ni.ID, - CanonicalName: ni.CanonicalName, - }, nil -} - func (t *KBFSNameInfoSource) loadAll(ctx context.Context, tlfName string, public bool) (res types.NameInfo, keys types.AllCryptKeys, err error) { var lastErr error keys = types.NewAllCryptKeys() diff --git a/go/chat/types/interfaces.go b/go/chat/types/interfaces.go index 3a2899c4c2e1..cab672eaefc4 100644 --- a/go/chat/types/interfaces.go +++ b/go/chat/types/interfaces.go @@ -38,7 +38,6 @@ type CryptKey interface { type AllCryptKeys map[chat1.ConversationMembersType][]CryptKey type NameInfoSource interface { - LookupIDUntrusted(ctx context.Context, name string, public bool) (NameInfoUntrusted, error) LookupID(ctx context.Context, name string, public bool) (NameInfo, error) LookupName(ctx context.Context, tlfID chat1.TLFID, public bool) (NameInfo, error) AllCryptKeys(ctx context.Context, name string, public bool) (AllCryptKeys, error) @@ -177,7 +176,7 @@ type InboxSource interface { SubteamRename(ctx context.Context, uid gregor1.UID, vers chat1.InboxVers, convIDs []chat1.ConversationID) ([]chat1.ConversationLocal, error) GetInboxQueryLocalToRemote(ctx context.Context, - lquery *chat1.GetInboxLocalQuery) (*chat1.GetInboxQuery, NameInfoUntrusted, error) + lquery *chat1.GetInboxLocalQuery) (*chat1.GetInboxQuery, NameInfo, error) SetRemoteInterface(func() chat1.RemoteInterface) } diff --git a/go/chat/types/types.go b/go/chat/types/types.go index fd071e1cc55b..2f1216628486 100644 --- a/go/chat/types/types.go +++ b/go/chat/types/types.go @@ -39,11 +39,6 @@ func NewAllCryptKeys() AllCryptKeys { return make(AllCryptKeys) } -type NameInfoUntrusted struct { - ID chat1.TLFID - CanonicalName string -} - type NameInfo struct { ID chat1.TLFID CanonicalName string diff --git a/go/kbtest/chat.go b/go/kbtest/chat.go index 1bf209854bdc..5e7aa92896b0 100644 --- a/go/kbtest/chat.go +++ b/go/kbtest/chat.go @@ -213,17 +213,6 @@ func (m *TlfMock) getTlfID(cname keybase1.CanonicalTlfName) (keybase1.TLFID, err return keybase1.TLFID(hex.EncodeToString([]byte(tlfID))), nil } -func (m *TlfMock) LookupIDUntrusted(ctx context.Context, tlfName string, public bool) (res types.NameInfoUntrusted, err error) { - ni, err := m.LookupID(ctx, tlfName, public) - if err != nil { - return res, err - } - return types.NameInfoUntrusted{ - ID: ni.ID, - CanonicalName: ni.CanonicalName, - }, nil -} - func (m *TlfMock) AllCryptKeys(ctx context.Context, tlfName string, public bool) (res types.AllCryptKeys, err error) { cres, err := m.CryptKeys(ctx, tlfName) if err != nil {