* Use url.PathEscape to escape the branchname * GetRepositoryByOwnerAndName should also have url.PathEscape as the owner and reponame are provided by the clientmaster
@@ -7,6 +7,7 @@ package private | |||||
import ( | import ( | ||||
"encoding/json" | "encoding/json" | ||||
"fmt" | "fmt" | ||||
"net/url" | |||||
"code.gitea.io/gitea/models" | "code.gitea.io/gitea/models" | ||||
"code.gitea.io/gitea/modules/log" | "code.gitea.io/gitea/modules/log" | ||||
@@ -16,7 +17,7 @@ import ( | |||||
// GetProtectedBranchBy get protected branch information | // GetProtectedBranchBy get protected branch information | ||||
func GetProtectedBranchBy(repoID int64, branchName string) (*models.ProtectedBranch, error) { | func GetProtectedBranchBy(repoID int64, branchName string) (*models.ProtectedBranch, error) { | ||||
// Ask for running deliver hook and test pull request tasks. | // Ask for running deliver hook and test pull request tasks. | ||||
reqURL := setting.LocalURL + fmt.Sprintf("api/internal/branch/%d/%s", repoID, branchName) | |||||
reqURL := setting.LocalURL + fmt.Sprintf("api/internal/branch/%d/%s", repoID, url.PathEscape(branchName)) | |||||
log.GitLogger.Trace("GetProtectedBranchBy: %s", reqURL) | log.GitLogger.Trace("GetProtectedBranchBy: %s", reqURL) | ||||
resp, err := newInternalRequest(reqURL, "GET").Response() | resp, err := newInternalRequest(reqURL, "GET").Response() | ||||
@@ -10,6 +10,7 @@ import ( | |||||
"fmt" | "fmt" | ||||
"net" | "net" | ||||
"net/http" | "net/http" | ||||
"net/url" | |||||
"code.gitea.io/gitea/models" | "code.gitea.io/gitea/models" | ||||
"code.gitea.io/gitea/modules/httplib" | "code.gitea.io/gitea/modules/httplib" | ||||
@@ -76,7 +77,7 @@ func CheckUnitUser(userID, repoID int64, isAdmin bool, unitType models.UnitType) | |||||
// GetRepositoryByOwnerAndName returns the repository by given ownername and reponame. | // GetRepositoryByOwnerAndName returns the repository by given ownername and reponame. | ||||
func GetRepositoryByOwnerAndName(ownerName, repoName string) (*models.Repository, error) { | func GetRepositoryByOwnerAndName(ownerName, repoName string) (*models.Repository, error) { | ||||
reqURL := setting.LocalURL + fmt.Sprintf("api/internal/repo/%s/%s", ownerName, repoName) | |||||
reqURL := setting.LocalURL + fmt.Sprintf("api/internal/repo/%s/%s", url.PathEscape(ownerName), url.PathEscape(repoName)) | |||||
log.GitLogger.Trace("GetRepositoryByOwnerAndName: %s", reqURL) | log.GitLogger.Trace("GetRepositoryByOwnerAndName: %s", reqURL) | ||||
resp, err := newInternalRequest(reqURL, "GET").Response() | resp, err := newInternalRequest(reqURL, "GET").Response() | ||||