-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SplitHTTP: Fix connection leaks and crashes (#3710)
- Loading branch information
Showing
7 changed files
with
109 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
package splithttp | ||
|
||
import ( | ||
"bytes" | ||
"io" | ||
|
||
"github.com/xtls/xray-core/common/errors" | ||
) | ||
|
||
// in older versions of splithttp, the server would respond with `ok` to flush | ||
// out HTTP response headers early. Response headers and a 200 OK were required | ||
// to initiate the connection. Later versions of splithttp dropped this | ||
// requirement, and in xray 1.8.24 the server stopped sending "ok" if it sees | ||
// x_padding. For compatibility, we need to remove "ok" from the underlying | ||
// reader if it exists, and otherwise forward the stream as-is. | ||
type stripOkReader struct { | ||
io.ReadCloser | ||
firstDone bool | ||
prefixRead []byte | ||
} | ||
|
||
func (r *stripOkReader) Read(b []byte) (int, error) { | ||
if !r.firstDone { | ||
r.firstDone = true | ||
|
||
// skip "ok" response | ||
prefixRead := []byte{0, 0} | ||
_, err := io.ReadFull(r.ReadCloser, prefixRead) | ||
if err != nil { | ||
return 0, errors.New("failed to read initial response").Base(err) | ||
} | ||
|
||
if !bytes.Equal(prefixRead, []byte("ok")) { | ||
// we read some garbage byte that may not have been "ok" at | ||
// all. return a reader that replays what we have read so far | ||
r.prefixRead = prefixRead | ||
} | ||
} | ||
|
||
if len(r.prefixRead) > 0 { | ||
n := copy(b, r.prefixRead) | ||
r.prefixRead = r.prefixRead[n:] | ||
return n, nil | ||
} | ||
|
||
n, err := r.ReadCloser.Read(b) | ||
return n, err | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters