-
-
Notifications
You must be signed in to change notification settings - Fork 78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement the pass through #172
Open
jerryyummy
wants to merge
10
commits into
mushorg:main
Choose a base branch
from
jerryyummy:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+82
−3
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
8b8c437
Implement the pass through
jerryyummy 5f3f0fc
Merge branch 'mushorg:main' into main
jerryyummy db77c15
Merge branch 'mushorg:main' into main
jerryyummy 751425c
Merge branch 'mushorg:main' into main
jerryyummy 09c86b9
Merge branch 'mushorg:main' into main
jerryyummy de9bd79
Merge branch 'mushorg:main' into main
jerryyummy 5b2075f
Merge remote-tracking branch 'origin/main'
jerryyummy f5df923
implement pass through and add comment
jerryyummy 26ea5ef
implement pass through and add comment
jerryyummy d4cba0e
Merge remote-tracking branch 'origin/main'
jerryyummy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
package tcp | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"io" | ||
"log/slog" | ||
"net" | ||
|
||
"github.com/mushorg/glutton/connection" | ||
"github.com/mushorg/glutton/producer" | ||
"github.com/mushorg/glutton/protocols/interfaces" | ||
) | ||
|
||
type parsedPassThrough struct { | ||
Direction string `json:"direction,omitempty"` | ||
Payload []byte `json:"payload,omitempty"` | ||
PayloadHash string `json:"payload_hash,omitempty"` | ||
} | ||
|
||
type passThroughServer struct { | ||
events []parsedPassThrough | ||
target string | ||
} | ||
|
||
func HandlePassThrough(ctx context.Context, conn net.Conn, md connection.Metadata, logger interfaces.Logger, h interfaces.Honeypot) error { | ||
srcAddr := conn.RemoteAddr().String() | ||
logger.Info("PassThrough details", | ||
slog.String("srcAddr", srcAddr), | ||
slog.String("localAddr", conn.LocalAddr().String())) | ||
|
||
destAddr := md.Rule.Target | ||
targetConn, err := net.Dial("tcp", destAddr) | ||
if err != nil { | ||
return fmt.Errorf("connection failed: %w", err) | ||
} | ||
defer targetConn.Close() | ||
defer conn.Close() | ||
|
||
errChan := make(chan error, 2) | ||
|
||
// source to target | ||
go func() { | ||
_, err := io.Copy(targetConn, conn) | ||
errChan <- err | ||
}() | ||
Comment on lines
+43
to
+46
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When is this go routine closed? |
||
|
||
// target to source | ||
go func() { | ||
_, err := io.Copy(conn, targetConn) | ||
errChan <- err | ||
}() | ||
|
||
// wait for either direction to succeed | ||
select { | ||
case err := <-errChan: | ||
if err != nil && err != io.EOF { | ||
logger.Error("Transfer error", producer.ErrAttr(err)) | ||
return err | ||
} | ||
case <-ctx.Done(): | ||
logger.Info("Context cancelled") | ||
return ctx.Err() | ||
} | ||
|
||
logger.Info("Pass through completed successfully") | ||
return nil | ||
} |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can use a host:port as a target here