LukeParke/libopenapi
1
0
Fork 0
mirror of https://github.com/LukeHagar/libopenapi.git synced 2025-12-09 12:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added some URL checking to index URL extraction.

Browse Source 
In the case of relative files, the first arg won’t be a URL, so this ensures both relatitve and full references work.
This commit is contained in:
Dave Shanley
2023-04-02 12:56:41 -04:00
parent 24d094ca7b
commit eec0c71092
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
index/find_component.go
View File

@@ -328,11 +328,16 @@ func (index *SpecIndex) performExternalLookup(uri []string, componentId string,
if len(uri[0]) > 0 {
// if there is no base url defined, but we can know we have been requested remotely,
// set the base url to the remote url base path.
if newUrl == nil || newUrl.String() != uri[0] {
ur, _ := url.Parse(uri[0])
newUrl, _ = url.Parse(fmt.Sprintf("%s://%s%s", ur.Scheme, ur.Host, filepath.Dir(ur.Path)))
// first check if the first param is actually a URL
io, er := url.ParseRequestURI(uri[0])
if er != nil {
newBasePath = filepath.Dir(filepath.Join(bd, uri[0]))
} else {
if newUrl == nil || newUrl.String() != io.String() {
newUrl, _ = url.Parse(fmt.Sprintf("%s://%s%s", io.Scheme, io.Host, filepath.Dir(io.Path)))
}
newBasePath = filepath.Dir(filepath.Join(bd, uri[1]))
}
newBasePath = filepath.Dir(filepath.Join(bd, uri[1]))
} else {
newBasePath = filepath.Dir(filepath.Join(bd, uri[0]))
}