* Use PathUnescape instead of QueryUnescape when working with branch names Currently branch names with a '+' fail in certain situations because QueryUnescape replaces the + character with a blank space. Using PathUnescape should be better since it is defined as: // PathUnescape is identical to QueryUnescape except that it does not // unescape '+' to ' ' (space). Fixes #6333 * Change error to match new function name * Add new util function PathEscapeSegments This function simply runs PathEscape on each segment of a path without touching the forward slash itself. We want to use this instead of PathEscape/QueryEscape in most cases because a forward slash is a valid name for a branch etc... and we don't want that escaped in a URL. Putting this in new file url.go and also moving a couple similar functions into that file as well. * Use EscapePathSegments where appropriate Replace various uses of EscapePath/EscapeQuery with new EscapePathSegments. Also remove uncessary uses of various escape/unescape functions when the text had already been escaped or was not escaped. * Reformat comment to make drone build happy * Remove no longer used url library * Requested code changes
		
			
				
	
	
		
			68 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			68 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2017 The Gitea Authors. All rights reserved.
 | |
| // Use of this source code is governed by a MIT-style
 | |
| // license that can be found in the LICENSE file.
 | |
| 
 | |
| package private
 | |
| 
 | |
| import (
 | |
| 	"encoding/json"
 | |
| 	"fmt"
 | |
| 
 | |
| 	"code.gitea.io/gitea/models"
 | |
| 	"code.gitea.io/gitea/modules/log"
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| 	"code.gitea.io/gitea/modules/util"
 | |
| )
 | |
| 
 | |
| // GetProtectedBranchBy get protected branch information
 | |
| func GetProtectedBranchBy(repoID int64, branchName string) (*models.ProtectedBranch, error) {
 | |
| 	// Ask for running deliver hook and test pull request tasks.
 | |
| 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/branch/%d/%s", repoID, util.PathEscapeSegments(branchName))
 | |
| 	log.GitLogger.Trace("GetProtectedBranchBy: %s", reqURL)
 | |
| 
 | |
| 	resp, err := newInternalRequest(reqURL, "GET").Response()
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	var branch models.ProtectedBranch
 | |
| 	if err := json.NewDecoder(resp.Body).Decode(&branch); err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	defer resp.Body.Close()
 | |
| 
 | |
| 	// All 2XX status codes are accepted and others will return an error
 | |
| 	if resp.StatusCode/100 != 2 {
 | |
| 		return nil, fmt.Errorf("Failed to get protected branch: %s", decodeJSONError(resp).Err)
 | |
| 	}
 | |
| 
 | |
| 	return &branch, nil
 | |
| }
 | |
| 
 | |
| // CanUserPush returns if user can push
 | |
| func CanUserPush(protectedBranchID, userID int64) (bool, error) {
 | |
| 	// Ask for running deliver hook and test pull request tasks.
 | |
| 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/protectedbranch/%d/%d", protectedBranchID, userID)
 | |
| 	log.GitLogger.Trace("CanUserPush: %s", reqURL)
 | |
| 
 | |
| 	resp, err := newInternalRequest(reqURL, "GET").Response()
 | |
| 	if err != nil {
 | |
| 		return false, err
 | |
| 	}
 | |
| 
 | |
| 	var canPush = make(map[string]interface{})
 | |
| 	if err := json.NewDecoder(resp.Body).Decode(&canPush); err != nil {
 | |
| 		return false, err
 | |
| 	}
 | |
| 
 | |
| 	defer resp.Body.Close()
 | |
| 
 | |
| 	// All 2XX status codes are accepted and others will return an error
 | |
| 	if resp.StatusCode/100 != 2 {
 | |
| 		return false, fmt.Errorf("Failed to retrieve push user: %s", decodeJSONError(resp).Err)
 | |
| 	}
 | |
| 
 | |
| 	return canPush["can_push"].(bool), nil
 | |
| }
 |