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

Web: fix git blame for files that have /stream/ in their path (#64230)

Browse Source 
The URL path for streaming blame is ambiguous when the file path
contains `/stream/`. The pattern looks like
`/blame/<repo_name>@<revision>/stream/file/path.txt`. However, if the
file contains `/stream/`, the revision is matched greedily up until the
last stream, so we end up with a revision that looks like
`81af3g/stream/my/path`, which is in invalid revision that results in a
404.

This makes the URL pattern unambiguous by adding a `/-/` element after
the revision, which is not allowed in a revision name and acts as a path
separator. So now, the pattern looks like
`/blame/<repo_name>@<revision>/-/stream/file/path.txt`.

Note, this is a public-facing breaking change, but I don't think it
really matters since I don't expect any customers use our streaming
blame API
This commit is contained in:
Camden Cheek 2024-08-02 14:11:32 -06:00 committed by GitHub
parent b4566aae8a
commit a148d8a670
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/web/src/repo/blame/shared.ts
View File

@ -147,10 +147,10 @@ function fetchBlameHunks(repoName: string, revision: string, filePath: string):
function fetchRawBlameHunks(repoName: string, revision: string, filePath: string): Observable<RawStreamHunk[]> {
const repoAndRevisionPath = `/${repoName}${revision ? `@${revision}` : ''}`
return new Observable<RawStreamHunk[]>(subscriber => {
fetchEventSource(`/.api/blame${repoAndRevisionPath}/stream/${filePath}`, {
fetchEventSource(`/.api/blame${repoAndRevisionPath}/-/stream/${filePath}`, {
method: 'GET',
headers: {
'X-Requested-With': 'Sourcegraph',
...window.context.xhrHeaders,
'X-Sourcegraph-Should-Trace': new URLSearchParams(window.location.search).get('trace') || 'false',
},
async onopen(response) {

2
cmd/frontend/internal/httpapi/httpapi.go
View File

@ -160,7 +160,7 @@ func NewHandler(
m.Path("/scip/upload").Methods("POST").Handler(handlers.NewCodeIntelUploadHandler(true))
m.Path("/scip/upload").Methods("HEAD").Handler(noopHandler)
m.Path("/compute/stream").Methods("GET", "POST").Handler(handlers.NewComputeStreamHandler())
m.Path("/blame/" + routevar.Repo + routevar.RepoRevSuffix + "/stream/{Path:.*}").Methods("GET").Handler(handleStreamBlame(logger, db, gitserver.NewClient("http.blamestream")))
m.Path("/blame/" + routevar.Repo + routevar.RepoRevSuffix + "/-/stream/{Path:.*}").Methods("GET").Handler(handleStreamBlame(logger, db, gitserver.NewClient("http.blamestream")))
// Set up the src-cli version cache handler (this will effectively be a
// no-op anywhere other than dot-com).
m.Path("/src-cli/versions/{rest:.*}").Methods("GET", "POST").Handler(releasecache.NewHandler(logger))