archive/revsuit
1
0
Fork 0
mirror of https://github.com/Li4n0/revsuit.git synced 2026-09-26 08:31:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(ftp): support receive ftp connection (#6)

Browse Source 
Co-authored-by: E99p1ant <[email protected]>
This commit is contained in:
Li4n0
2021-04-25 13:39:27 +08:00
committed by GitHub
co-authored by E99p1ant
parent 5e24f9530d
commit 26755351f7
36 changed files with 1446 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/dns/dns.go
+12 -11
View File
@@ -8,6 +8,7 @@ import (
"github.com/li4n0/revsuit/internal/database"
"github.com/li4n0/revsuit/internal/newdns"
"github.com/li4n0/revsuit/internal/qqwry"
"github.com/li4n0/revsuit/internal/rule"
"github.com/patrickmn/go-cache"
log "unknwon.dev/clog/v2"
)
@@ -72,7 +73,7 @@ func (s *Server) Run() {
ip := strings.Split(remoteAddr, ":")[0]
for _, _rule := range s.getRules() {
flag, flagGroup := _rule.Match(domain)
flag, flagGroup, vars := _rule.Match(domain)
if flag == "" {
continue
}
@@ -82,7 +83,7 @@ func (s *Server) Run() {
log.Error("DNS record(rule_id:%s) created failed :%s", _rule.Name, err.Error())
return nil, nil
}
log.Info("DNS record(id:%d,rule:%s,remote_ip:%s) has been created", r.ID, _rule.Name, ip)
log.Info("DNS record[id:%d rule:%s remote_ip:%s] has been created", r.ID, _rule.Name, ip)
//only send to client when this connection recorded first time.
if _rule.PushToClient {
@@ -91,11 +92,11 @@ func (s *Server) Run() {
database.DB.Where("rule_name=? and domain like ?", _rule.Name, "%"+flagGroup+"%").Model(&Record{}).Count(&count)
if count <= 1 {
r.PushToClient()
log.Trace("DNS record(id:%d) has been put to client message queue", r.ID)
log.Trace("DNS record[id%d] has been put to client message queue", r.ID)
}
} else {
r.PushToClient()
log.Trace("DNS record(id:%d) has been put to client message queue", r.ID)
log.Trace("DNS record[id%d] has been put to client message queue", r.ID)
}
}
@@ -103,12 +104,12 @@ func (s *Server) Run() {
if _rule.Notice {
go func() {
r.Notice()
log.Trace("DNS record(id:%d) notice has been sent", r.ID)
log.Trace("DNS record[id%d] notice has been sent", r.ID)
}()
}
if _rule.Value != "" {
value := rule.CompileTpl(_rule.Value, vars)
_type := _rule.Type
if _rule.Type == newdns.REBINDING {
_type = newdns.A
@@ -121,16 +122,16 @@ func (s *Server) Run() {
Records: func() []newdns.Record {
switch _rule.Type {
case newdns.TXT:
return []newdns.Record{{Data: []string{_rule.Value}}}
return []newdns.Record{{Data: []string{value}}}
case newdns.CNAME, newdns.NS:
return []newdns.Record{{Address: _rule.Value + "."}}
return []newdns.Record{{Address: value + "."}}
case newdns.REBINDING:
// Get rebinding ip list
values, ok := rebindingCache.Get(ip)
if !ok {
rebindingCache.Set(ip, strings.Split(_rule.Value, ","), cache.DefaultExpiration)
values = strings.Split(_rule.Value, ",")
rebindingCache.Set(ip, strings.Split(value, ","), cache.DefaultExpiration)
values = strings.Split(value, ",")
}
//Choose and delete first ip
@@ -144,7 +145,7 @@ func (s *Server) Run() {
log.Trace("DNS rebinding client(ip:%v) to %v", ip, value)
return []newdns.Record{{Address: value}}
default:
return []newdns.Record{{Address: _rule.Value}}
return []newdns.Record{{Address: value}}
}
}(),
TTL: _rule.TTL * time.Second,
pkg/dns/rule.go
+3 -3
View File
@@ -157,9 +157,9 @@ func UpsertRules(c *gin.Context) {
}
if update {
log.Trace("DNS rule(id:%d) has been updated", dnsRule.ID)
log.Trace("DNS rule[id%d] has been updated", dnsRule.ID)
} else {
log.Trace("DNS rule(id:%d) has been created", dnsRule.ID)
log.Trace("DNS rule[id%d] has been created", dnsRule.ID)
}
c.JSON(200, gin.H{
@@ -191,7 +191,7 @@ func DeleteRules(c *gin.Context) {
return
}
log.Trace("DNS rule(id:%d) has been deleted", dnsRule.ID)
log.Trace("DNS rule[id%d] has been deleted", dnsRule.ID)
c.JSON(200, gin.H{
"status": "succeed",
pkg/ftp/config.go
+8
View File
@@ -0,0 +1,8 @@
package ftp
type Config struct {
Enable bool
Addr string
PasvIP string `yaml:"pasv_ip"`
PasvPort int `yaml:"pasv_port"`
}
pkg/ftp/ftp.go
+230
View File
@@ -0,0 +1,230 @@
package ftp
import (
"bytes"
"fmt"
"net"
"strconv"
"strings"
"sync"
"time"
"github.com/li4n0/revsuit/internal/database"
"github.com/li4n0/revsuit/internal/qqwry"
"github.com/li4n0/revsuit/internal/rule"
log "unknwon.dev/clog/v2"
)
type Server struct {
Config
rules []*Rule
rulesLock sync.RWMutex
}
type Status string
const (
CRASHED Status = "CRASHED"
FINISHED Status = "FINISHED"
)
var (
server *Server
once sync.Once
)
func GetServer() *Server {
once.Do(func() {
server = &Server{rulesLock: sync.RWMutex{}}
})
return server
}
func (s *Server) getRules() []*Rule {
defer s.rulesLock.RUnlock()
s.rulesLock.RLock()
return s.rules
}
func (s *Server) updateRules() error {
db := database.DB.Model(new(Rule))
s.rulesLock.Lock()
db.Order("rank desc").Find(&s.rules)
s.rulesLock.Unlock()
return nil
}
func (s *Server) handleConnection(conn net.Conn) {
defer conn.Close()
if err := conn.SetDeadline(time.Now().Add(time.Second * 30)); err != nil {
log.Error("FTP set connection deadline error:%v", err.Error())
}
if _, err := conn.Write([]byte("220 (vsFTPd 3.0.2)\r\n")); err != nil {
log.Error("FTP write connection error:%v", err.Error())
}
ip := strings.Split(conn.RemoteAddr().String(), ":")[0]
buf := &bytes.Buffer{}
var user, password, path, flag, flagGroup string
status := CRASHED
var matchedRule *Rule
var vars map[string]string
loop:
for {
data := make([]byte, 2048)
n, err := conn.Read(data)
if err != nil {
break
}
buf.Write(data[:n])
if buf.Len() > 4 {
cmd := string(buf.Bytes()[:4])
switch cmd {
case "USER":
user = strings.TrimRight(string(buf.Bytes()[5:]), "\r\n")
_, _ = conn.Write([]byte("331 password please - version check\r\n"))
case "PASS":
password = strings.TrimRight(string(buf.Bytes()[5:]), "\r\n")
_, _ = conn.Write([]byte("230 User logged in\r\n"))
for _, _rule := range s.getRules() {
for _, s := range []string{user, password} {
flag, flagGroup, vars = _rule.Match(s)
if flag != "" {
vars["user"] = user
vars["password"] = password
break
}
}
if flag == "" {
continue
}
matchedRule = _rule
}
case "QUIT":
_, _ = conn.Write([]byte("221 Goodbye.\r\n"))
case "RETR":
path += "/" + strings.TrimRight(string(buf.Bytes()[5:]), "\r\n")
_, _ = conn.Write([]byte("451 Nope\r\n"))
_, _ = conn.Write([]byte("221 Goodbye.\r\n"))
status = FINISHED
break loop
case "EPSV", "EPRT", "PORT":
// refuse to use EPSV/EPRT/PORT in order to make the client to use PASV mode.
_, _ = conn.Write([]byte(fmt.Sprintf("500 '%s': command not understood.\r\n", cmd)))
case "PASV":
// return rule's pasv_address or default pasv address
ret := fmt.Sprintf("227 Entering Passive Mode (%s,%v,%d)\r\n", strings.ReplaceAll(s.PasvIP, ".", ","), float64(s.PasvPort/256), s.PasvPort%256)
if matchedRule != nil && matchedRule.PasvAddress != "" {
pasvAddress := rule.CompileTpl(matchedRule.PasvAddress, vars)
pasvIP, pasvPort, err := net.SplitHostPort(pasvAddress)
if err != nil {
log.Warn("FTP failed to split rule[id%d] pasv_address(%s) :%s", matchedRule.ID, pasvAddress, err.Error())
break
}
port, err := strconv.Atoi(pasvPort)
if err != nil {
log.Warn("FTP failed to convert rule[id%d] pasv_port(%s) :%s", matchedRule.ID, pasvPort, err.Error())
break
}
ret = fmt.Sprintf("227 Entering Passive Mode (%s,%v,%d)\r\n", strings.ReplaceAll(pasvIP, ".", ","), float64(port/256), port%256)
}
_, _ = conn.Write([]byte(ret))
default:
cmd = string(buf.Bytes()[:3])
if cmd == "CWD" {
_, _ = conn.Write([]byte("250 Directory successfully changed.\r\n"))
path += "/" + strings.TrimRight(string(buf.Bytes()[4:]), "\r\n")
} else if cmd == "PWD" {
_, _ = conn.Write([]byte("257 \"/\" is the current directory\r\n"))
} else {
_, _ = conn.Write([]byte("230 more data please!\r\n"))
}
}
}
buf = &bytes.Buffer{}
}
if matchedRule != nil {
_rule := matchedRule
area := qqwry.Area(ip)
// create new record
r, err := NewRecord(_rule, flag, user, password, path, ip, area, status)
if err != nil {
log.Error("FTP record[rule_id:%d] created failed :%s", _rule.ID, err.Error())
return
}
log.Info("FTP record[id:%d rule:%s remote_ip:%s] has been created", r.ID, _rule.Name, ip)
//only send to client when this connection recorded first time.
if _rule.PushToClient {
if flagGroup != "" {
var count int64
database.DB.Where("rule_name=? and raw like ?", _rule.Name, "%"+flagGroup+"%").Model(&Record{}).Count(&count)
if count <= 1 {
r.PushToClient()
log.Trace("FTP record[id%d] has been put to client message queue", r.ID)
}
}
r.PushToClient()
log.Trace("FTP record[id%d] has been put to client message queue", r.ID)
}
//send notice
if _rule.Notice {
go func() {
r.Notice()
log.Trace("FTP record[id%d] notice has been sent", r.ID)
}()
}
}
}
func (s *Server) Run() {
if err := s.updateRules(); err != nil {
log.Fatal(err.Error())
}
// run server
log.Info("Starting FTP Server at %v", s.Addr)
listener, err := net.Listen("tcp", s.Addr)
if err != nil {
log.Fatal(err.Error())
}
go func() {
pasvAddress := fmt.Sprintf("%s:%d", strings.Split(s.Addr, ":")[0], s.PasvPort)
log.Info("Start to listen FTP PASV port at %v", pasvAddress)
listener, err := net.Listen("tcp", pasvAddress)
if err != nil {
log.Fatal("FTP failed to listen on pasv port : %v", err)
}
for {
tcpConn, err := listener.Accept()
if err != nil {
log.Error("FTP accept connection error: %v", err)
continue
}
_ = tcpConn.Close()
}
}()
for {
tcpConn, err := listener.Accept()
if err != nil {
log.Error("FTP accept connection error: %v", err)
continue
}
go s.handleConnection(tcpConn)
}
}
pkg/ftp/record.go
+112
View File
@@ -0,0 +1,112 @@
package ftp
import (
"strconv"
"time"
"github.com/gin-gonic/gin"
"github.com/li4n0/revsuit/internal/database"
"github.com/li4n0/revsuit/internal/notice"
"github.com/li4n0/revsuit/internal/record"
)
var _ record.Record = (*Record)(nil)
type Record struct {
User string `form:"user" json:"user"`
Password string `form:"password" json:"password"`
Path string `form:"path" json:"path"`
Status Status `form:"status" json:"status"`
record.BaseRecord
Rule Rule `gorm:"foreignKey:RuleName;references:Name;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;" form:"-" json:"-" notice:"-"`
}
func (Record) TableName() string {
return "ftp_records"
}
func (r Record) Notice() {
notice.Notice(r)
}
func NewRecord(rule *Rule, flag, user, password, path, ip, area string, status Status) (r *Record, err error) {
r = &Record{
BaseRecord: record.BaseRecord{
Flag: flag,
RemoteIP: ip,
IpArea: area,
RequestTime: time.Now(),
},
Path: path,
User: user,
Password: password,
Status: status,
Rule: *rule,
}
err = database.DB.Create(r).Error
return r, err
}
func ListRecords(c *gin.Context) {
var (
ftpRecord Record
res []Record
count int64
order = c.Query("order")
)
if err := c.ShouldBind(&ftpRecord); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"result": nil,
})
return
}
db := database.DB.Model(&ftpRecord)
if ftpRecord.Flag != "" {
db.Where("flag = ?", ftpRecord.Flag)
}
if ftpRecord.Path != "" {
db.Where("path like ?", "%"+ftpRecord.Path+"%")
}
if ftpRecord.Status != "" {
db.Where("status = ?", ftpRecord.Status)
}
if ftpRecord.RemoteIP != "" {
db.Where("remote_ip = ?", ftpRecord.RemoteIP)
}
if ftpRecord.RuleName != "" {
db.Where("rule_name = ?", ftpRecord.RuleName)
}
page, err := strconv.Atoi(c.Query("page"))
if err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"result": nil,
})
return
}
if order != "asc" {
order = "desc"
}
if err := db.Order("id" + " " + order).Count(&count).Offset((page - 1) * 10).Limit(10).Find(&res).Error; err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"data": nil,
})
return
}
c.JSON(200, gin.H{
"status": "succeed",
"error": nil,
"result": gin.H{"count": count, "data": res},
})
}
pkg/ftp/rule.go
+194
View File
@@ -0,0 +1,194 @@
package ftp
import (
"strconv"
"github.com/gin-gonic/gin"
"github.com/li4n0/revsuit/internal/database"
"github.com/li4n0/revsuit/internal/rule"
"gorm.io/gorm/clause"
log "unknwon.dev/clog/v2"
)
// FTP rule struct
type Rule struct {
rule.BaseRule
PasvAddress string `gorm:"pasv_address" json:"pasv_address" form:"pasv_address"`
}
func (Rule) TableName() string {
return "ftp_rules"
}
// NewRule creates a new ftp rule struct
func NewRule(name, flagFormat, pasvAddress string, pushToClient, notice bool) *Rule {
return &Rule{
BaseRule: rule.BaseRule{
Name: name,
FlagFormat: flagFormat,
PushToClient: pushToClient,
Notice: notice,
},
PasvAddress: pasvAddress,
}
}
// CreateOrUpdate creates or updates the ftp rule in database and ruleSet
func (r *Rule) CreateOrUpdate() (err error) {
db := database.DB.Model(r)
err = db.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "id"}},
DoUpdates: clause.AssignmentColumns(
[]string{
"name",
"flag_format",
"rank",
"pasv_address",
"push_to_client",
"notice",
}),
}).Create(r).Error
if err != nil {
return
}
return GetServer().updateRules()
}
// Delete deletes the ftp rule in database and ruleSet
func (r *Rule) Delete() (err error) {
db := database.DB.Model(r)
err = db.Delete(r).Error
if err != nil {
return
}
return GetServer().updateRules()
}
// ListRules lists all ftp rules those satisfy the filter
func ListRules(c *gin.Context) {
var (
ftpRule Rule
res []Rule
count int64
order = c.Query("order")
)
if err := c.ShouldBind(&ftpRule); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"result": nil,
})
return
}
db := database.DB.Model(&ftpRule)
if ftpRule.Name != "" {
db.Where("name = ?", ftpRule.Name)
}
db.Count(&count)
page, err := strconv.Atoi(c.Query("page"))
if err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"result": nil,
})
return
}
if order != "asc" {
order = "desc"
}
if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * 10).Limit(10).Find(&res).Error; err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"data": nil,
})
return
}
c.JSON(200, gin.H{
"status": "succeed",
"error": nil,
"result": gin.H{"count": count, "data": res},
})
}
// Create or update ftp rule from user submit
func UpsertRules(c *gin.Context) {
var (
ftpRule Rule
update bool
)
if err := c.ShouldBind(&ftpRule); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"data": nil,
})
return
}
if ftpRule.ID != 0 {
update = true
}
if err := ftpRule.CreateOrUpdate(); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"result": nil,
})
return
}
if update {
log.Trace("FTP rule[id%d] has been updated", ftpRule.ID)
} else {
log.Trace("FTP rule[id%d] has been created", ftpRule.ID)
}
c.JSON(200, gin.H{
"status": "succeed",
"error": nil,
"result": nil,
})
}
// Delete ftp rule from user submit
func DeleteRules(c *gin.Context) {
var ftpRule Rule
if err := c.ShouldBind(&ftpRule); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"data": nil,
})
return
}
if err := ftpRule.Delete(); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"data": nil,
})
return
}
log.Trace("FTP rule[id%d] has been deleted", ftpRule.ID)
c.JSON(200, gin.H{
"status": "succeed",
"error": nil,
"data": nil,
})
}
pkg/mysql/mysql.go
+22 -14
View File
@@ -65,8 +65,9 @@ func (s *Server) NewConnection(c *vmysql.Conn) {
)
for _, _rule := range s.getRules() {
flag, _ := _rule.Match(user + schema)
if flag == "" {
userFlag, _, _ := _rule.Match(user)
schemaFlag, _, _ := _rule.Match(schema)
if userFlag == "" && schemaFlag == "" {
continue
}
s.connRulePool.Store(c.ConnectionID, _rule)
@@ -81,8 +82,6 @@ func (s *Server) NewConnection(c *vmysql.Conn) {
if strings.Contains(c.ConnAttrs["_client_name"], "MySQL Connector") {
c.IsJdbcClient = true
c.SupportLoadDataLocal = true
// 测试发现只有 pymysql 和原生命令行会对这个 flag 真正进行修改
// 而且 Connector/J 默认值为 False, 所以这里做特殊兼容
}
}
}
@@ -90,21 +89,30 @@ func (s *Server) NewConnection(c *vmysql.Conn) {
// ConnectionClosed is part of the mysql.Handler interface.
func (s *Server) ConnectionClosed(c *vmysql.Conn) {
log.Trace("MySQL Client leaved, ID [%d]", c.ConnectionID)
var (
user = c.User
clientName string
clientOS string
supportLoadLocalData = c.SupportLoadDataLocal
cr, ok = s.connRulePool.Load(c.ConnectionID)
user = c.User
schema = c.SchemaName
supportLoadLocalData = c.SupportLoadDataLocal
cr, ok = s.connRulePool.Load(c.ConnectionID)
clientName, clientOS, flag, flagGroup string
)
if !ok {
return
}
_rule := cr.(*Rule)
flag, flagGroup := _rule.Match(user)
for _, s := range []string{user, schema} {
flag, flagGroup, _ = _rule.Match(s)
if flag != "" {
break
}
}
if flag == "" {
log.Error("MySQL Connection rule(%d) not match flag", c.ConnectionID)
}
if c.ConnAttrs != nil {
clientName = c.ConnAttrs["_client_name"] + " " + c.ConnAttrs["_client_version"]
clientOS = c.ConnAttrs["_os"] + " " + c.ConnAttrs["_platform"]
@@ -125,7 +133,7 @@ func (s *Server) ConnectionClosed(c *vmysql.Conn) {
log.Error("MySQL record(rule_id:%s) created failed :%s", _rule.Name, err.Error())
return
}
log.Info("MySQL record(id:%d,rule:%s,remote_ip:%s) has been created", r.ID, _rule.Name, ip)
log.Info("MySQL record[id:%d rule:%s remote_ip:%s] has been created", r.ID, _rule.Name, ip)
//only send to client when this connection recorded first time.
if _rule.PushToClient {
@@ -134,11 +142,11 @@ func (s *Server) ConnectionClosed(c *vmysql.Conn) {
database.DB.Where("rule_name=? and domain like ?", _rule.Name, "%"+flagGroup+"%").Model(&Record{}).Count(&count)
if count <= 1 {
r.PushToClient()
log.Trace("MySQL record(id:%d) has been put to client message queue", r.ID)
log.Trace("MySQL record[id%d] has been put to client message queue", r.ID)
}
} else {
r.PushToClient()
log.Trace("MySQL record(id:%d) has been put to client message queue", r.ID)
log.Trace("MySQL record[id%d] has been put to client message queue", r.ID)
}
}
@@ -146,7 +154,7 @@ func (s *Server) ConnectionClosed(c *vmysql.Conn) {
if _rule.Notice {
go func() {
r.Notice()
log.Trace("MySQL record(id:%d) notice has been sent", r.ID)
log.Trace("MySQL record[id%d] notice has been sent", r.ID)
}()
}
pkg/mysql/record.go
+7
View File
@@ -81,6 +81,13 @@ func ListRecords(c *gin.Context) {
if mysqlRecord.ClientName != "" {
db.Where("client_name like ?", "%"+mysqlRecord.ClientName)
}
if c.Query("load_local_data") != "" {
if c.Query("load_local_data") == "true" {
db.Where("load_local_data = ?", true)
} else {
db.Where("load_local_data = ?", false)
}
}
page, err := strconv.Atoi(c.Query("page"))
if err != nil {
pkg/mysql/rule.go
+3 -3
View File
@@ -140,9 +140,9 @@ func UpsertRules(c *gin.Context) {
}
if update {
log.Trace("MySQL rule(id:%d) has been updated", mysqlRule.ID)
log.Trace("MySQL rule[id%d] has been updated", mysqlRule.ID)
} else {
log.Trace("MySQL rule(id:%d) has been created", mysqlRule.ID)
log.Trace("MySQL rule[id%d] has been created", mysqlRule.ID)
}
c.JSON(200, gin.H{
@@ -174,7 +174,7 @@ func DeleteRules(c *gin.Context) {
return
}
log.Trace("MySQL rule(id:%d) has been deleted", mysqlRule.ID)
log.Trace("MySQL rule[id%d] has been deleted", mysqlRule.ID)
c.JSON(200, gin.H{
"status": "succeed",
pkg/rhttp/http.go
+23 -18
View File
@@ -106,26 +106,31 @@ func getRawRequest(r *http.Request) ([]byte, error) {
return httputil.DumpRequestOut(r, true)
}
func compileTpl(c *gin.Context, tpl string) (compiled string) {
func compileTpl(c *gin.Context, tpl string, vars map[string]string) (compiled string) {
compiled = tpl
if queryVarMatcher.FindString(tpl) != "" {
compiled = queryVarMatcher.ReplaceAllString(compiled, c.Query(queryVarMatcher.FindStringSubmatch(tpl)[1]))
for _, submatch := range queryVarMatcher.FindAllStringSubmatch(tpl, -1) {
compiled = strings.ReplaceAll(compiled, submatch[0], c.Query(submatch[1]))
}
if bodyVarMatcher.FindString(tpl) != "" {
compiled = bodyVarMatcher.ReplaceAllString(compiled, c.PostForm(bodyVarMatcher.FindStringSubmatch(tpl)[1]))
for _, submatch := range bodyVarMatcher.FindAllStringSubmatch(tpl, -1) {
compiled = strings.ReplaceAll(compiled, submatch[0], c.PostForm(submatch[1]))
}
if headerVarMatcher.FindString(tpl) != "" {
compiled = headerVarMatcher.ReplaceAllString(compiled, c.GetHeader(headerVarMatcher.FindStringSubmatch(tpl)[1]))
for _, submatch := range headerVarMatcher.FindAllStringSubmatch(tpl, -1) {
compiled = strings.ReplaceAll(compiled, submatch[0], c.GetHeader(submatch[1]))
}
for n, v := range vars {
compiled = strings.ReplaceAll(compiled, "${"+n+"}", v)
}
return compiled
}
func (s *Server) Receive(c *gin.Context) {
u := c.Request.URL.String()
for _, _rule := range s.getRules() {
flag, flagGroup := _rule.Match(u)
flag, flagGroup, vars := _rule.Match(u)
if flag == "" {
continue
}
@@ -148,16 +153,16 @@ func (s *Server) Receive(c *gin.Context) {
// create new record
r, err := NewRecord(_rule, flag, c.Request.Method, u, ip, area, string(raw))
if err != nil {
log.Error("HTTP record(rule_id:%d) created failed :%s", _rule.ID, err.Error())
code, err := strconv.Atoi(compileTpl(c, _rule.ResponseStatusCode))
log.Error("HTTP record[rule_id:%d] created failed :%s", _rule.ID, err.Error())
code, err := strconv.Atoi(compileTpl(c, _rule.ResponseStatusCode, vars))
if err != nil || code < 100 || code > 600 {
code = 400
}
c.String(code, compileTpl(c, _rule.ResponseBody))
c.String(code, compileTpl(c, _rule.ResponseBody, vars))
return
}
log.Info("HTTP record(id:%d,rule:%s,remote_ip:%s) has been created", r.ID, _rule.Name, ip)
log.Info("HTTP record[id:%d rule:%s remote_ip:%s] has been created", r.ID, _rule.Name, ip)
//only send to client when this connection recorded first time.
if _rule.PushToClient {
@@ -166,31 +171,31 @@ func (s *Server) Receive(c *gin.Context) {
database.DB.Where("rule_name=? and raw like ?", _rule.Name, "%"+flagGroup+"%").Model(&Record{}).Count(&count)
if count <= 1 {
r.PushToClient()
log.Trace("HTTP record(id:%d) has been put to client message queue", r.ID)
log.Trace("HTTP record[id%d] has been put to client message queue", r.ID)
}
}
r.PushToClient()
log.Trace("HTTP record(id:%d) has been put to client message queue", r.ID)
log.Trace("HTTP record[id%d] has been put to client message queue", r.ID)
}
//send notice
if _rule.Notice {
go func() {
r.Notice()
log.Trace("HTTP record(id:%d) notice has been sent", r.ID)
log.Trace("HTTP record[id%d] notice has been sent", r.ID)
}()
}
for header, value := range _rule.ResponseHeaders {
c.Header(compileTpl(c, header), compileTpl(c, value))
c.Header(compileTpl(c, header, vars), compileTpl(c, value, vars))
}
code, err := strconv.Atoi(compileTpl(c, _rule.ResponseStatusCode))
code, err := strconv.Atoi(compileTpl(c, _rule.ResponseStatusCode, vars))
if err != nil || code < 100 || code > 600 {
code = 400
}
c.String(code, compileTpl(c, _rule.ResponseBody))
c.String(code, compileTpl(c, _rule.ResponseBody, vars))
return
}
pkg/rhttp/rule.go
+3 -3
View File
@@ -158,9 +158,9 @@ func UpsertRules(c *gin.Context) {
}
if update {
log.Trace("HTTP rule(id:%d) has been updated", httpRule.ID)
log.Trace("HTTP rule[id%d] has been updated", httpRule.ID)
} else {
log.Trace("HTTP rule(id:%d) has been created", httpRule.ID)
log.Trace("HTTP rule[id%d] has been created", httpRule.ID)
}
c.JSON(200, gin.H{
@@ -192,7 +192,7 @@ func DeleteRules(c *gin.Context) {
return
}
log.Trace("HTTP rule(id:%d) has been deleted", httpRule.ID)
log.Trace("HTTP rule[id%d] has been deleted", httpRule.ID)
c.JSON(200, gin.H{
"status": "succeed",
pkg/rmi/rmi.go
+8 -7
View File
@@ -49,11 +49,12 @@ func (s *Server) updateRules() error {
func (s *Server) handleConnection(conn net.Conn) {
defer conn.Close()
ip, port, _ := net.SplitHostPort(conn.RemoteAddr().String())
if err := conn.SetDeadline(time.Now().Add(time.Second * 30)); err != nil {
log.Error("RMI set connection deadline error:%v", err.Error())
}
ip, port, _ := net.SplitHostPort(conn.RemoteAddr().String())
buf := make([]byte, 1024)
_, err := conn.Read(buf)
if err != nil {
@@ -94,7 +95,7 @@ func (s *Server) handleConnection(conn net.Conn) {
path := strings.TrimRight(string(frags[len(frags)-1][2:]), "\x00")
for _, _rule := range s.getRules() {
flag, flagGroup := _rule.Match(path)
flag, flagGroup, _ := _rule.Match(path)
if flag == "" {
continue
}
@@ -104,10 +105,10 @@ func (s *Server) handleConnection(conn net.Conn) {
// create new record
r, err := NewRecord(_rule, flag, path, ip, area)
if err != nil {
log.Error("RMI record(rule_id:%d) created failed :%s", _rule.ID, err.Error())
log.Error("RMI record[rule_id:%d] created failed :%s", _rule.ID, err.Error())
return
}
log.Info("RMI record(id:%d,rule:%s,remote_ip:%s) has been created", r.ID, _rule.Name, ip)
log.Info("RMI record[id:%d rule:%s remote_ip:%s] has been created", r.ID, _rule.Name, ip)
//only send to client when this connection recorded first time.
if _rule.PushToClient {
@@ -116,18 +117,18 @@ func (s *Server) handleConnection(conn net.Conn) {
database.DB.Where("rule_name=? and raw like ?", _rule.Name, "%"+flagGroup+"%").Model(&Record{}).Count(&count)
if count <= 1 {
r.PushToClient()
log.Trace("RMI record(id:%d) has been put to client message queue", r.ID)
log.Trace("RMI record[id%d] has been put to client message queue", r.ID)
}
}
r.PushToClient()
log.Trace("RMI record(id:%d) has been put to client message queue", r.ID)
log.Trace("RMI record[id%d] has been put to client message queue", r.ID)
}
//send notice
if _rule.Notice {
go func() {
r.Notice()
log.Trace("RMI record(id:%d) notice has been sent", r.ID)
log.Trace("RMI record[id%d] notice has been sent", r.ID)
}()
}
}
pkg/rmi/rule.go
+4 -4
View File
@@ -10,7 +10,7 @@ import (
log "unknwon.dev/clog/v2"
)
// Http rule struct
// RMI rule struct
type Rule struct {
rule.BaseRule
}
@@ -149,9 +149,9 @@ func UpsertRules(c *gin.Context) {
}
if update {
log.Trace("RMI rule(id:%d) has been updated", rmiRule.ID)
log.Trace("RMI rule[id%d] has been updated", rmiRule.ID)
} else {
log.Trace("RMI rule(id:%d) has been created", rmiRule.ID)
log.Trace("RMI rule[id%d] has been created", rmiRule.ID)
}
c.JSON(200, gin.H{
@@ -183,7 +183,7 @@ func DeleteRules(c *gin.Context) {
return
}
log.Trace("RMI rule(id:%d) has been deleted", rmiRule.ID)
log.Trace("RMI rule[id%d] has been deleted", rmiRule.ID)
c.JSON(200, gin.H{
"status": "succeed",
pkg/server/config.go
+2
View File
@@ -2,6 +2,7 @@ package server
import (
"github.com/li4n0/revsuit/pkg/dns"
"github.com/li4n0/revsuit/pkg/ftp"
"github.com/li4n0/revsuit/pkg/mysql"
"github.com/li4n0/revsuit/pkg/rhttp"
"github.com/li4n0/revsuit/pkg/rmi"
@@ -24,4 +25,5 @@ type Config struct {
DNS dns.Config
MySQL mysql.Config
RMI rmi.Config
FTP ftp.Config
}
pkg/server/router.go
+14
View File
@@ -7,6 +7,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/li4n0/revsuit/frontend"
"github.com/li4n0/revsuit/pkg/dns"
"github.com/li4n0/revsuit/pkg/ftp"
"github.com/li4n0/revsuit/pkg/mysql"
"github.com/li4n0/revsuit/pkg/rhttp"
"github.com/li4n0/revsuit/pkg/rmi"
@@ -15,6 +16,11 @@ import (
func (revsuit *Revsuit) registerRouter() {
revsuit.http.Router = gin.Default()
if revsuit.logLevel != log.LevelTrace {
revsuit.http.Router = gin.New()
revsuit.http.Router.Use(gin.Recovery())
}
revsuit.registerPlatformRouter()
revsuit.registerHttpRouter()
}
@@ -61,6 +67,9 @@ func (revsuit *Revsuit) registerHttpRouter() {
rmiGroup := recordGroup.Group("/rmi")
rmiGroup.GET("", rmi.ListRecords)
ftpGroup := recordGroup.Group("/ftp")
ftpGroup.GET("", ftp.ListRecords)
// init rule router group
ruleGroup := revsuit.http.ApiGroup.Group("/rule")
@@ -84,6 +93,11 @@ func (revsuit *Revsuit) registerHttpRouter() {
rmiGroup.POST("", rmi.UpsertRules)
rmiGroup.DELETE("", rmi.DeleteRules)
ftpGroup = ruleGroup.Group("/ftp")
ftpGroup.GET("", ftp.ListRules)
ftpGroup.POST("", ftp.UpsertRules)
ftpGroup.DELETE("", ftp.DeleteRules)
// init file router group
fileGroup := revsuit.http.ApiGroup.Group("/file")
fileGroup.GET("/mysql/:id", mysql.GetFile)
pkg/server/server.go
+24 -5
View File
@@ -5,6 +5,7 @@ import (
"github.com/li4n0/revsuit/internal/database"
"github.com/li4n0/revsuit/internal/notice"
"github.com/li4n0/revsuit/pkg/dns"
"github.com/li4n0/revsuit/pkg/ftp"
"github.com/li4n0/revsuit/pkg/mysql"
http "github.com/li4n0/revsuit/pkg/rhttp"
"github.com/li4n0/revsuit/pkg/rmi"
@@ -13,10 +14,13 @@ import (
)
type Revsuit struct {
logLevel log.Level
http *http.Server
dns *dns.Server
mysql *mysql.Server
rmi *rmi.Server
ftp *ftp.Server
}
func initDatabase(dsn string) {
@@ -61,11 +65,18 @@ func initDatabase(dsn string) {
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&ftp.Record{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&ftp.Rule{})
if err != nil {
log.Fatal(err.Error())
}
}
func initLog(level string) {
var logLevel log.Level
func initLog(level string) (logLevel log.Level) {
switch level {
case "debug":
@@ -93,7 +104,7 @@ func initLog(level string) {
log.ConsoleConfig{
Level: logLevel,
})
return logLevel
}
func initNotice(nc noticeConfig) {
@@ -123,11 +134,12 @@ func initNotice(nc noticeConfig) {
func New(c *Config) *Revsuit {
initDatabase(c.Database)
initLog(c.LogLevel)
logLevel := initLog(c.LogLevel)
initNotice(c.Notice)
s := &Revsuit{
http: http.GetServer(),
logLevel: logLevel,
http: http.GetServer(),
}
if c.DNS.Enable {
s.dns = dns.GetServer()
@@ -140,6 +152,10 @@ func New(c *Config) *Revsuit {
s.rmi = rmi.GetServer()
s.rmi.Config = c.RMI
}
if c.FTP.Enable {
s.ftp = ftp.GetServer()
s.ftp.Config = c.FTP
}
if c.Addr != "" {
s.http.SetAddr(c.Addr)
@@ -166,6 +182,9 @@ func (revsuit *Revsuit) Run() {
if revsuit.rmi != nil {
go revsuit.rmi.Run()
}
if revsuit.ftp != nil {
go revsuit.ftp.Run()
}
revsuit.http.Run()
}