IntenseWebs/boringproxy
3
0
Fork 0
mirror of https://github.com/boringproxy/boringproxy.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

linting: should replace errors.New(fmt.Sprintf(...)) with fmt.Errorf(...) (golint)

Browse Source
This commit is contained in:
Filipe Pina
2022-07-07 07:49:17 +01:00
parent 004fea55f7
commit bcbb2e9f6e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api.go
View File

@@ -472,7 +472,7 @@ func (a *Api) CreateToken(tokenData TokenData, params url.Values) (string, error
if client != "any" { if client != "any" {
if _, exists := owner.Clients[client]; !exists { if _, exists := owner.Clients[client]; !exists {
return "", errors.New(fmt.Sprintf("Client %s does not exist for user %s", client, ownerId)) return "", fmt.Errorf("Client %s does not exist for user %s", client, ownerId)
} }
} else { } else {
client = "" client = ""

14
client.go
View File

@@ -125,25 +125,25 @@ func (c *Client) Run(ctx context.Context) error {
clientReq, err := http.NewRequest("POST", url, nil) clientReq, err := http.NewRequest("POST", url, nil)
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Failed to create request for URL %s", url)) return fmt.Errorf("Failed to create request for URL %s", url)
} }
if len(c.token) > 0 { if len(c.token) > 0 {
clientReq.Header.Add("Authorization", "bearer "+c.token) clientReq.Header.Add("Authorization", "bearer "+c.token)
} }
resp, err := c.httpClient.Do(clientReq) resp, err := c.httpClient.Do(clientReq)
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Failed to create client. Ensure the server is running. URL: %s", url)) return fmt.Errorf("Failed to create client. Ensure the server is running. URL: %s", url)
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
body, err := ioutil.ReadAll(resp.Body) body, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Failed to create client. HTTP Status code: %d. Failed to read body", resp.StatusCode)) return fmt.Errorf("Failed to create client. HTTP Status code: %d. Failed to read body", resp.StatusCode)
} }
msg := string(body) msg := string(body)
return errors.New(fmt.Sprintf("Failed to create client. Are the user ('%s') and token correct? HTTP Status code: %d. Message: %s", c.user, resp.StatusCode, msg)) return fmt.Errorf("Failed to create client. Are the user ('%s') and token correct? HTTP Status code: %d. Message: %s", c.user, resp.StatusCode, msg)
} }
for { for {
@@ -266,7 +266,7 @@ func (c *Client) BoreTunnel(ctx context.Context, tunnel Tunnel) error {
signer, err := ssh.ParsePrivateKey([]byte(tunnel.TunnelPrivateKey)) signer, err := ssh.ParsePrivateKey([]byte(tunnel.TunnelPrivateKey))
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Unable to parse private key: %v", err)) return fmt.Errorf("Unable to parse private key: %v", err)
} }
//var hostKey ssh.PublicKey //var hostKey ssh.PublicKey
@@ -283,7 +283,7 @@ func (c *Client) BoreTunnel(ctx context.Context, tunnel Tunnel) error {
sshHost := fmt.Sprintf("%s:%d", tunnel.ServerAddress, tunnel.ServerPort) sshHost := fmt.Sprintf("%s:%d", tunnel.ServerAddress, tunnel.ServerPort)
client, err := ssh.Dial("tcp", sshHost, config) client, err := ssh.Dial("tcp", sshHost, config)
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Failed to dial: ", err)) return fmt.Errorf("Failed to dial: %v", err)
} }
defer client.Close() defer client.Close()
@@ -294,7 +294,7 @@ func (c *Client) BoreTunnel(ctx context.Context, tunnel Tunnel) error {
tunnelAddr := fmt.Sprintf("%s:%d", bindAddr, tunnel.TunnelPort) tunnelAddr := fmt.Sprintf("%s:%d", bindAddr, tunnel.TunnelPort)
listener, err := client.Listen("tcp", tunnelAddr) listener, err := client.Listen("tcp", tunnelAddr)
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Unable to register tcp forward for %s:%d %v", bindAddr, tunnel.TunnelPort, err)) return fmt.Errorf("Unable to register tcp forward for %s:%d %v", bindAddr, tunnel.TunnelPort, err)
} }
defer listener.Close() defer listener.Close()