actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2026-03-19 17:17:38 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: add HTTP status checks to GetUserByName; remove redundant FindHomePage check

Browse Source 
GetUserByName made two REST requests without checking the HTTP status
codes. A 401/403/500 response would silently be treated as an empty
result set and return 'user not found' instead of the real error.
Add a status check after each request.

FindHomePage had 'StatusNotFound || != StatusOK' — the first clause
is always a subset of the second, making it dead code. Simplified to
just '!= StatusOK'.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Manuel Rüger 2026-03-13 02:01:45 +01:00
parent 0d735203dd
commit ed6ae15500
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
confluence/api.go
View File

@ -180,7 +180,7 @@ func (api *API) FindHomePage(space string) (*PageInfo, error) {
return nil, err return nil, err
} }
if request.Raw.StatusCode == http.StatusNotFound || request.Raw.StatusCode != http.StatusOK { if request.Raw.StatusCode != http.StatusOK {
return nil, newErrorStatusNotOK(request) return nil, newErrorStatusNotOK(request)
} }
@ -691,7 +691,7 @@ func (api *API) GetUserByName(name string) (*User, error) {
} }
// Try the new path first // Try the new path first
_, err := api.rest. request, err := api.rest.
Res("search"). Res("search").
Res("user", &response). Res("user", &response).
Get(map[string]string{ Get(map[string]string{
@ -700,10 +700,13 @@ func (api *API) GetUserByName(name string) (*User, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if request.Raw.StatusCode != http.StatusOK {
return nil, newErrorStatusNotOK(request)
}
// Try old path // Try old path
if len(response.Results) == 0 { if len(response.Results) == 0 {
_, err := api.rest. request, err := api.rest.
Res("search", &response). Res("search", &response).
Get(map[string]string{ Get(map[string]string{
"cql": fmt.Sprintf("user.fullname~%q", name), "cql": fmt.Sprintf("user.fullname~%q", name),
@ -711,6 +714,9 @@ func (api *API) GetUserByName(name string) (*User, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if request.Raw.StatusCode != http.StatusOK {
return nil, newErrorStatusNotOK(request)
}
} }
if len(response.Results) == 0 { if len(response.Results) == 0 {