go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add HTTP plugin

Browse Source
This commit is contained in:
ginuerzh
2023-09-20 22:56:43 +08:00
parent afddd2d29e
commit 1760151500
29 changed files with 1032 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
admission/admission.go
View File

@ -9,7 +9,7 @@ import (
"sync"
"time"
admission_pkg "github.com/go-gost/core/admission"
"github.com/go-gost/core/admission"
"github.com/go-gost/core/logger"
"github.com/go-gost/x/internal/loader"
"github.com/go-gost/x/internal/matcher"
@ -69,7 +69,7 @@ func LoggerOption(logger logger.Logger) Option {
}
}
type admission struct {
type localAdmission struct {
ipMatcher matcher.Matcher
cidrMatcher matcher.Matcher
mu sync.RWMutex
@ -79,14 +79,14 @@ type admission struct {
// NewAdmission creates and initializes a new Admission using matcher patterns as its match rules.
// The rules will be reversed if the reverse is true.
func NewAdmission(opts ...Option) admission_pkg.Admission {
func NewAdmission(opts ...Option) admission.Admission {
var options options
for _, opt := range opts {
opt(&options)
}
ctx, cancel := context.WithCancel(context.TODO())
p := &admission{
p := &localAdmission{
cancelFunc: cancel,
options: options,
}
@ -101,7 +101,7 @@ func NewAdmission(opts ...Option) admission_pkg.Admission {
return p
}
func (p *admission) Admit(ctx context.Context, addr string) bool {
func (p *localAdmission) Admit(ctx context.Context, addr string) bool {
if addr == "" || p == nil {
return true
}
@ -117,7 +117,7 @@ func (p *admission) Admit(ctx context.Context, addr string) bool {
p.options.whitelist && matched
}
func (p *admission) periodReload(ctx context.Context) error {
func (p *localAdmission) periodReload(ctx context.Context) error {
period := p.options.period
if period < time.Second {
period = time.Second
@ -138,7 +138,7 @@ func (p *admission) periodReload(ctx context.Context) error {
}
}
func (p *admission) reload(ctx context.Context) error {
func (p *localAdmission) reload(ctx context.Context) error {
v, err := p.load(ctx)
if err != nil {
return err
@ -167,7 +167,7 @@ func (p *admission) reload(ctx context.Context) error {
return nil
}
func (p *admission) load(ctx context.Context) (patterns []string, err error) {
func (p *localAdmission) load(ctx context.Context) (patterns []string, err error) {
if p.options.fileLoader != nil {
if lister, ok := p.options.fileLoader.(loader.Lister); ok {
list, er := lister.List(ctx)
@ -221,7 +221,7 @@ func (p *admission) load(ctx context.Context) (patterns []string, err error) {
return
}
func (p *admission) parsePatterns(r io.Reader) (patterns []string, err error) {
func (p *localAdmission) parsePatterns(r io.Reader) (patterns []string, err error) {
if r == nil {
return
}
@ -237,14 +237,14 @@ func (p *admission) parsePatterns(r io.Reader) (patterns []string, err error) {
return
}
func (p *admission) parseLine(s string) string {
func (p *localAdmission) parseLine(s string) string {
if n := strings.IndexByte(s, '#'); n >= 0 {
s = s[:n]
}
return strings.TrimSpace(s)
}
func (p *admission) matched(addr string) bool {
func (p *localAdmission) matched(addr string) bool {
p.mu.RLock()
defer p.mu.RUnlock()
@ -252,7 +252,7 @@ func (p *admission) matched(addr string) bool {
p.cidrMatcher.Match(addr)
}
func (p *admission) Close() error {
func (p *localAdmission) Close() error {
p.cancelFunc()
if p.options.fileLoader != nil {
p.options.fileLoader.Close()

99
admission/plugin.go
View File

@ -1,12 +1,16 @@
package admission
import (
"bytes"
"context"
"encoding/json"
"io"
"net/http"
admission_pkg "github.com/go-gost/core/admission"
"github.com/go-gost/core/admission"
"github.com/go-gost/core/logger"
"github.com/go-gost/plugin/admission/proto"
"github.com/go-gost/x/internal/util/plugin"
"google.golang.org/grpc"
)
@ -17,13 +21,24 @@ type grpcPluginAdmission struct {
}
// NewGRPCPluginAdmission creates an Admission plugin based on gRPC.
func NewGRPCPluginAdmission(name string, conn grpc.ClientConnInterface) admission_pkg.Admission {
func NewGRPCPluginAdmission(name string, addr string, opts ...plugin.Option) admission.Admission {
var options plugin.Options
for _, opt := range opts {
opt(&options)
}
log := logger.Default().WithFields(map[string]any{
"kind": "admission",
"admission": name,
})
conn, err := plugin.NewGRPCConn(addr, &options)
if err != nil {
log.Error(err)
}
p := &grpcPluginAdmission{
conn: conn,
log: logger.Default().WithFields(map[string]any{
"kind": "admission",
"admission": name,
}),
log: log,
}
if conn != nil {
p.client = proto.NewAdmissionClient(conn)
@ -53,3 +68,75 @@ func (p *grpcPluginAdmission) Close() error {
}
return nil
}
type httpAdmissionRequest struct {
Addr string `json:"addr"`
}
type httpAdmissionResponse struct {
OK bool `json:"ok"`
}
type httpPluginAdmission struct {
url string
client *http.Client
header http.Header
log logger.Logger
}
// NewHTTPPluginAdmission creates an Admission plugin based on HTTP.
func NewHTTPPluginAdmission(name string, url string, opts ...plugin.Option) admission.Admission {
var options plugin.Options
for _, opt := range opts {
opt(&options)
}
return &httpPluginAdmission{
url: url,
client: plugin.NewHTTPClient(&options),
header: options.Header,
log: logger.Default().WithFields(map[string]any{
"kind": "admission",
"admission": name,
}),
}
}
func (p *httpPluginAdmission) Admit(ctx context.Context, addr string) (ok bool) {
if p.client == nil {
return
}
rb := httpAdmissionRequest{
Addr: addr,
}
v, err := json.Marshal(&rb)
if err != nil {
return
}
req, err := http.NewRequest(http.MethodPost, p.url, bytes.NewReader(v))
if err != nil {
return
}
if p.header != nil {
req.Header = p.header.Clone()
}
req.Header.Set("Content-Type", "application/json")
resp, err := p.client.Do(req)
if err != nil {
return
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
return
}
res := httpAdmissionResponse{}
if err := json.NewDecoder(resp.Body).Decode(&res); err != nil {
return
}
return res.OK
}

2
admission/wrapper/listener.go
View File

@ -5,11 +5,13 @@ import (
"net"
"github.com/go-gost/core/admission"
"github.com/go-gost/core/logger"
)
type listener struct {
net.Listener
admission admission.Admission
log logger.Logger
}
func WrapListener(admission admission.Admission, ln net.Listener) net.Listener {