+
Skip to content

Use url.QueryEscape instead of url.PathEscape to escape query string #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 28, 2019
Merged

Use url.QueryEscape instead of url.PathEscape to escape query string #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
558920a
Use url.QueryEscape instead of url.PathEscape to escape query string
pankona Feb 20, 2019
55ec64b
fix expected URI of some test cases
pankona Feb 20, 2019
6bc0bca
remove redundant codes
pankona Feb 20, 2019
cff8599
Supply comments on search funcion to highlight notice about " " vs "+"
pankona Feb 22, 2019
63ab8d9
Don't lead * (pointer indicator) for variable in comments
pankona Feb 22, 2019
b94a2b5
Modify tests to use "+" in query to make escape result more clear
pankona Feb 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions github/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ package github
import (
"context"
"fmt"
"net/url"
"strconv"
"strings"

qs "github.com/google/go-querystring/query"
)
Expand Down Expand Up @@ -218,20 +216,19 @@ func (s *SearchService) Labels(ctx context.Context, repoID int64, query string,

// Helper function that executes search queries against different
// GitHub search types (repositories, commits, code, issues, users, labels)
//
// If searchParameters.Query includes multiple condition, it MUST NOT include "+" as condition separator.
// For example, querying with "language:c++" and "leveldb", then searchParameters.Query should be "language:c++ leveldb" but not "language:c+++leveldb".
func (s *SearchService) search(ctx context.Context, searchType string, parameters *searchParameters, opt *SearchOptions, result interface{}) (*Response, error) {
params, err := qs.Values(opt)
if err != nil {
return nil, err
}
q := strings.Replace(parameters.Query, " ", "+", -1)
if parameters.RepositoryID != nil {
params.Set("repository_id", strconv.FormatInt(*parameters.RepositoryID, 10))
}
query := "q=" + url.PathEscape(q)
if v := params.Encode(); v != "" {
query = query + "&" + v
}
u := fmt.Sprintf("search/%s?%s", searchType, query)
params.Set("q", parameters.Query)
u := fmt.Sprintf("search/%s?%s", searchType, params.Encode())

req, err := s.client.NewRequest("GET", u, nil)
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions github/search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func TestSearchService_Issues_withQualifiersNoOpts(t *testing.T) {
client, mux, _, teardown := setup()
defer teardown()

const q = "gopher is:issue label:bug language:go pushed:>=2018-01-01 stars:>=200"
const q = "gopher is:issue label:bug language:c++ pushed:>=2018-01-01 stars:>=200"

var requestURI string
mux.HandleFunc("/search/issues", func(w http.ResponseWriter, r *http.Request) {
Expand All @@ -134,7 +134,7 @@ func TestSearchService_Issues_withQualifiersNoOpts(t *testing.T) {
t.Errorf("Search.Issues returned error: %v", err)
}

if want := "/api-v3/search/issues?q=gopher+is:issue+label:bug+language:go+pushed:%3E=2018-01-01+stars:%3E=200"; requestURI != want {
if want := "/api-v3/search/issues?q=gopher+is%3Aissue+label%3Abug+language%3Ac%2B%2B+pushed%3A%3E%3D2018-01-01+stars%3A%3E%3D200"; requestURI != want {
t.Fatalf("URI encoding failed: got %v, want %v", requestURI, want)
}

Expand All @@ -152,7 +152,7 @@ func TestSearchService_Issues_withQualifiersAndOpts(t *testing.T) {
client, mux, _, teardown := setup()
defer teardown()

const q = "gopher is:issue label:bug language:go pushed:>=2018-01-01 stars:>=200"
const q = "gopher is:issue label:bug language:c++ pushed:>=2018-01-01 stars:>=200"

var requestURI string
mux.HandleFunc("/search/issues", func(w http.ResponseWriter, r *http.Request) {
Expand All @@ -172,7 +172,7 @@ func TestSearchService_Issues_withQualifiersAndOpts(t *testing.T) {
t.Errorf("Search.Issues returned error: %v", err)
}

if want := "/api-v3/search/issues?q=gopher+is:issue+label:bug+language:go+pushed:%3E=2018-01-01+stars:%3E=200&sort=forks"; requestURI != want {
if want := "/api-v3/search/issues?q=gopher+is%3Aissue+label%3Abug+language%3Ac%2B%2B+pushed%3A%3E%3D2018-01-01+stars%3A%3E%3D200&sort=forks"; requestURI != want {
t.Fatalf("URI encoding failed: got %v, want %v", requestURI, want)
}

Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载