artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 12:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

symbols: Minor code cleanup (#63708)

Browse Source 
Was reading through the service, found these things and figured why not
commit them.

Test plan:

CI.
This commit is contained in:
Erik Seliger 2024-07-10 01:22:03 +02:00 committed by GitHub
parent bd3baef6e0
commit 60dc37d1a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/symbols/shared/setup.go
View File

@ -117,8 +117,8 @@ func loadRockskipConfig(baseConfig env.BaseConfig, ctags types.CtagsConfig, repo
LogQueries: baseConfig.GetBool("LOG_QUERIES", "false", "print search queries to stdout"),
IndexRequestsQueueSize: baseConfig.GetInt("INDEX_REQUESTS_QUEUE_SIZE", "1000", "how many index requests can be queued at once, at which point new requests will be rejected"),
MaxConcurrentlyIndexing: baseConfig.GetInt("ROCKSKIP_MAX_CONCURRENTLY_INDEXING", "4", "maximum number of repositories being indexed at a time (also limits ctags processes)"),
SymbolsCacheSize: baseConfig.GetInt("SYMBOLS_CACHE_SIZE", "100000", "how many tuples of (path, symbol name, int ID) to cache in memory"),
PathSymbolsCacheSize: baseConfig.GetInt("PATH_SYMBOLS_CACHE_SIZE", "10000", "how many sets of symbols for files to cache in memory"),
SymbolsCacheSize: baseConfig.GetInt("SYMBOLS_CACHE_SIZE", "100000", "how many tuples of (path, symbol name, int ID) to cache in memory while indexing a specific repo"),
PathSymbolsCacheSize: baseConfig.GetInt("PATH_SYMBOLS_CACHE_SIZE", "10000", "how many sets of symbols for files to cache in memory while indexing a specific repo"),
SearchLastIndexedCommit: baseConfig.GetBool("SEARCH_LAST_INDEXED_COMMIT", "false", "falls back to searching the most recently indexed commit if the requested commit is not indexed"),
}
}

1
internal/symbols/BUILD.bazel
View File

@ -17,7 +17,6 @@ go_library(
"//internal/conf/conftypes",
"//internal/endpoint",
"//internal/grpc/defaults",
"//internal/limiter",
"//internal/search",
"//internal/search/result",
"//internal/symbols/v1:symbols",

24
internal/symbols/client.go
View File

@ -15,7 +15,6 @@ import (
"github.com/sourcegraph/sourcegraph/internal/conf/conftypes"
"github.com/sourcegraph/sourcegraph/internal/endpoint"
"github.com/sourcegraph/sourcegraph/internal/grpc/defaults"
"github.com/sourcegraph/sourcegraph/internal/limiter"
"github.com/sourcegraph/sourcegraph/internal/search"
"github.com/sourcegraph/sourcegraph/internal/search/result"
proto "github.com/sourcegraph/sourcegraph/internal/symbols/v1"
@ -34,7 +33,6 @@ func LoadConfig() {
DefaultClient = &Client{
Endpoints: defaultEndpoints(),
GRPCConnectionCache: defaults.NewConnectionCache(log.Scoped("symbolsConnectionCache")),
HTTPLimiter: limiter.New(500),
SubRepoPermsChecker: func() authz.SubRepoPermissionChecker { return authz.DefaultSubRepoPermsChecker },
}
}
@ -50,9 +48,6 @@ type Client struct {
GRPCConnectionCache *defaults.ConnectionCache
// Limits concurrency of outstanding HTTP posts
HTTPLimiter limiter.Limiter
// SubRepoPermsChecker is function to return the checker to use. It needs to be a
// function since we expect the client to be set at runtime once we have a
// database connection.
@ -192,26 +187,11 @@ func (c *Client) SymbolInfo(ctx context.Context, args types.RepoCommitPathPoint)
}
// 🚨 SECURITY: We have a valid result, so we need to apply sub-repo permissions filtering.
if c.SubRepoPermsChecker == nil {
return result, err
}
checker := c.SubRepoPermsChecker()
if !authz.SubRepoEnabled(checker) {
return result, err
}
a := actor.FromContext(ctx)
// Filter in place
rc := authz.RepoContent{
Repo: api.RepoName(args.Repo),
Path: args.Path,
}
perm, err := authz.ActorPermissions(ctx, checker, a, rc)
ok, err := authz.FilterActorPath(ctx, c.SubRepoPermsChecker(), actor.FromContext(ctx), api.RepoName(args.Repo), args.Path)
if err != nil {
return nil, errors.Wrap(err, "checking sub-repo permissions")
}
if !perm.Include(authz.Read) {
if !ok {
return nil, nil
}