Skip to content

Commit

Permalink
Chore: fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Loyalsoldier committed Mar 28, 2021
1 parent a0c8178 commit 090a659
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
3 changes: 1 addition & 2 deletions app/browserforwarder/forwarder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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
}

Expand Down
1 change: 0 additions & 1 deletion common/platform/securedload/embeddedhash.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
7 changes: 3 additions & 4 deletions common/platform/securedload/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 2 deletions transport/internet/websocket/dialer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 090a659

Please sign in to comment.