lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

Chore: fix lint

Browse Source
This commit is contained in:
loyalsoldier 2021-03-28 09:33:00 +08:00
parent a0c817888b
commit 090a659cab
No known key found for this signature in database
GPG Key ID: 23829BBC1ACF2C90
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/browserforwarder/forwarder.go
View File

@ -37,7 +37,6 @@ func (f *Forwarder) ServeHTTP(writer http.ResponseWriter, request *http.Request)
fallthrough
case "index.js":
BridgeResource(writer, request, requestPath)
break
case "link":
f.forwarder.ServeBridge(writer, request)
}
@ -83,7 +82,7 @@ func BridgeResource(rw http.ResponseWriter, r *http.Request, path string) {
data, err := securedload.GetAssetSecured("browserforwarder/" + content)
if err != nil {
err = newError("cannot load necessary resources").Base(err)
http.Error(rw, err.Error(), 403)
http.Error(rw, err.Error(), http.StatusForbidden)
return
}

1
common/platform/securedload/embeddedhash.go
View File

@ -30,7 +30,6 @@ func (e EmbeddedHashProtectedLoader) VerifyAndLoad(filename string) ([]byte, err
return filecontent, nil
}
}
}
return nil, newError("Unrecognized file at ", filename, " can not be loaded for execution")
}

7
common/platform/securedload/file.go
View File

@ -3,16 +3,15 @@ package securedload
import "path/filepath"
func GetAssetSecured(name string) ([]byte, error) {
name = filepath.FromSlash(name)
var err error
for k, v := range knownProtectedLoader {
if loadedData, errLoad := v.VerifyAndLoad(name); errLoad == nil {
loadedData, errLoad := v.VerifyAndLoad(name)
if errLoad == nil {
return loadedData, nil
} else {
err = newError(k, " is not loading executable file").Base(errLoad)
}
err = newError(k, " is not loading executable file").Base(errLoad)
}
return nil, err
}

4
transport/internet/websocket/dialer.go
View File

@ -124,7 +124,7 @@ func (d dialerWithEarlyData) Dial(earlyData []byte) (*websocket.Conn, error) {
return nil, newError("websocket delayed dialer cannot encode early data tail").Base(errc)
}
conn, resp, err := d.dialer.Dial(d.uriBase+string(earlyDataBuf.Bytes()), d.config.GetRequestHeader())
conn, resp, err := d.dialer.Dial(d.uriBase+earlyDataBuf.String(), d.config.GetRequestHeader())
if err != nil {
var reason string
if resp != nil {
@ -161,7 +161,7 @@ func (d dialerWithEarlyDataRelayed) Dial(earlyData []byte) (io.ReadWriteCloser,
return nil, newError("websocket delayed dialer cannot encode early data tail").Base(errc)
}
conn, err := d.forwarder.DialWebsocket(d.uriBase+string(earlyDataBuf.Bytes()), d.config.GetRequestHeader())
conn, err := d.forwarder.DialWebsocket(d.uriBase+earlyDataBuf.String(), d.config.GetRequestHeader())
if err != nil {
var reason string
return nil, newError("failed to dial to (", d.uriBase, ") with early data: ", reason).Base(err)