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

feat(ldap): add ldap protocol support (#50)

Browse Source 
Co-authored-by: tardc <[email protected]>
Co-authored-by: E99p1ant <[email protected]>
This commit is contained in:
Li4n0
2022-01-07 22:47:02 +08:00
committed by GitHub
co-authored by tardc E99p1ant
parent 06ae3d0555
commit fc505b0733
46 changed files with 1356 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/server/config.go
+2
View File
@@ -4,6 +4,7 @@ import (
"github.com/li4n0/revsuit/internal/ipinfo"
"github.com/li4n0/revsuit/pkg/dns"
"github.com/li4n0/revsuit/pkg/ftp"
"github.com/li4n0/revsuit/pkg/ldap"
"github.com/li4n0/revsuit/pkg/mysql"
"github.com/li4n0/revsuit/pkg/rhttp"
"github.com/li4n0/revsuit/pkg/rmi"
@@ -31,5 +32,6 @@ type Config struct {
DNS dns.Config
MySQL mysql.Config
RMI rmi.Config
LDAP ldap.Config
FTP ftp.Config
}
pkg/server/router.go
+12
View File
@@ -10,6 +10,7 @@ import (
"github.com/li4n0/revsuit/internal/file"
"github.com/li4n0/revsuit/pkg/dns"
"github.com/li4n0/revsuit/pkg/ftp"
"github.com/li4n0/revsuit/pkg/ldap"
"github.com/li4n0/revsuit/pkg/mysql"
"github.com/li4n0/revsuit/pkg/rhttp"
"github.com/li4n0/revsuit/pkg/rmi"
@@ -69,6 +70,8 @@ func (revsuit *Revsuit) registerHttpRouter() {
settingsGroup.POST("/updateDnsConfig", revsuit.updateDnsConfig)
settingsGroup.GET("/getRmiConfig", revsuit.getRmiConfig)
settingsGroup.POST("/updateRmiConfig", revsuit.updateRmiConfig)
settingsGroup.GET("/getLdapConfig", revsuit.getLdapConfig)
settingsGroup.POST("/updateLdapConfig", revsuit.updateLdapConfig)
settingsGroup.GET("/getMySQLConfig", revsuit.getMySQLConfig)
settingsGroup.POST("/updateMySQLConfig", revsuit.updateMySQLConfig)
settingsGroup.GET("/getFtpConfig", revsuit.getFtpConfig)
@@ -95,6 +98,10 @@ func (revsuit *Revsuit) registerHttpRouter() {
rmiGroup.GET("", rmi.Records)
rmiGroup.DELETE("", rmi.Records)
ldapGroup := recordGroup.Group("/ldap")
ldapGroup.GET("", ldap.Records)
ldapGroup.DELETE("", ldap.Records)
ftpGroup := recordGroup.Group("/ftp")
ftpGroup.GET("", ftp.Records)
ftpGroup.DELETE("", ftp.Records)
@@ -122,6 +129,11 @@ func (revsuit *Revsuit) registerHttpRouter() {
rmiGroup.POST("", rmi.UpsertRules)
rmiGroup.DELETE("", rmi.DeleteRules)
ldapGroup = ruleGroup.Group("/ldap")
ldapGroup.GET("", ldap.ListRules)
ldapGroup.POST("", ldap.UpsertRules)
ldapGroup.DELETE("", ldap.DeleteRules)
ftpGroup = ruleGroup.Group("/ftp")
ftpGroup.GET("", ftp.ListRules)
ftpGroup.POST("", ftp.UpsertRules)
pkg/server/server.go
+33 -45
View File
@@ -11,6 +11,7 @@ import (
"github.com/li4n0/revsuit/internal/record"
"github.com/li4n0/revsuit/pkg/dns"
"github.com/li4n0/revsuit/pkg/ftp"
"github.com/li4n0/revsuit/pkg/ldap"
"github.com/li4n0/revsuit/pkg/mysql"
http "github.com/li4n0/revsuit/pkg/rhttp"
"github.com/li4n0/revsuit/pkg/rmi"
@@ -28,6 +29,7 @@ type Revsuit struct {
dns *dns.Server
mysql *mysql.Server
rmi *rmi.Server
ldap *ldap.Server
ftp *ftp.Server
clients map[int]*gin.Context
@@ -66,55 +68,35 @@ func initDatabase(dsn string) {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&http.Record{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&dns.Record{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&mysql.Record{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&http.Rule{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&dns.Rule{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&mysql.Rule{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&file.MySQLFile{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&rmi.Record{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&rmi.Rule{})
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())
}
err = database.DB.AutoMigrate(&file.FTPFile{})
err = database.DB.AutoMigrate(&http.Record{}, &http.Rule{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&dns.Record{}, &dns.Rule{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&mysql.Record{}, &mysql.Rule{}, &file.MySQLFile{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&rmi.Record{}, &rmi.Rule{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&ldap.Record{}, &ldap.Rule{})
if err != nil {
log.Fatal(err.Error())
}
err = database.DB.AutoMigrate(&ftp.Record{}, &ftp.Rule{}, &file.FTPFile{})
if err != nil {
log.Fatal(err.Error())
}
}
func initLog(level string) (logLevel log.Level) {
@@ -198,6 +180,9 @@ func New(c *Config) *Revsuit {
s.rmi = rmi.GetServer()
s.rmi.Config = c.RMI
s.ldap = ldap.GetServer()
s.ldap.Config = c.LDAP
s.ftp = ftp.GetServer()
s.ftp.Config = c.FTP
@@ -232,6 +217,9 @@ func (revsuit *Revsuit) Run() {
if revsuit.rmi != nil && revsuit.rmi.Enable {
go revsuit.rmi.Run()
}
if revsuit.ldap != nil && revsuit.ldap.Enable {
go revsuit.ldap.Run()
}
if revsuit.mysql != nil && revsuit.mysql.Enable {
go revsuit.mysql.Run()
}
pkg/server/settings.go
+55 -5
View File
@@ -9,6 +9,7 @@ import (
"github.com/li4n0/revsuit/internal/database"
"github.com/li4n0/revsuit/pkg/dns"
"github.com/li4n0/revsuit/pkg/ftp"
"github.com/li4n0/revsuit/pkg/ldap"
"github.com/li4n0/revsuit/pkg/mysql"
"github.com/li4n0/revsuit/pkg/rhttp"
"github.com/li4n0/revsuit/pkg/rmi"
@@ -22,6 +23,7 @@ type Rules struct {
Dns []dns.Rule
Mysql []mysql.Rule
Rmi []rmi.Rule
Ldap []ldap.Rule
Ftp []ftp.Rule
}
@@ -35,6 +37,7 @@ func exportRules(c *gin.Context) {
db.Model(&dns.Rule{}).Find(&rules.Dns)
db.Model(&mysql.Rule{}).Find(&rules.Mysql)
db.Model(&rmi.Rule{}).Find(&rules.Rmi)
db.Model(&rmi.Rule{}).Find(&rules.Ldap)
db.Model(&ftp.Rule{}).Find(&rules.Ftp)
out, err := yaml.Marshal(rules)
@@ -88,7 +91,7 @@ func (revsuit *Revsuit) importRules(c *gin.Context) {
for _, rule := range rules.Http {
if err := db.Model(&rhttp.Rule{}).Create(&rule).Error; err != nil {
errs = append(errs, errors.Wrap(err, fmt.Sprintf("http rule[%s]", rule.Name)).Error())
errs = append(errs, errors.Wrapf(err, "http rule[%s]", rule.Name).Error())
continue
}
count++
@@ -99,7 +102,7 @@ func (revsuit *Revsuit) importRules(c *gin.Context) {
for _, rule := range rules.Dns {
if err := db.Model(&dns.Rule{}).Create(&rule).Error; err != nil {
errs = append(errs, errors.Wrap(err, fmt.Sprintf("dns rule[%s]", rule.Name)).Error())
errs = append(errs, errors.Wrapf(err, "dns rule[%s]", rule.Name).Error())
continue
}
count++
@@ -110,7 +113,7 @@ func (revsuit *Revsuit) importRules(c *gin.Context) {
for _, rule := range rules.Mysql {
if err := db.Model(&mysql.Rule{}).Create(&rule).Error; err != nil {
errs = append(errs, errors.Wrap(err, fmt.Sprintf("mysql rule[%s]", rule.Name)).Error())
errs = append(errs, errors.Wrapf(err, "mysql rule[%s]", rule.Name).Error())
continue
}
count++
@@ -121,7 +124,7 @@ func (revsuit *Revsuit) importRules(c *gin.Context) {
for _, rule := range rules.Rmi {
if err := db.Model(&rmi.Rule{}).Create(&rule).Error; err != nil {
errs = append(errs, errors.Wrap(err, fmt.Sprintf("rmi rule[%s]", rule.Name)).Error())
errs = append(errs, errors.Wrapf(err, "rmi rule[%s]", rule.Name).Error())
continue
}
count++
@@ -130,9 +133,20 @@ func (revsuit *Revsuit) importRules(c *gin.Context) {
errs = append(errs, err.Error())
}
for _, rule := range rules.Ldap {
if err := db.Model(&ldap.Rule{}).Create(&rule).Error; err != nil {
errs = append(errs, errors.Wrapf(err, "ldap rule[%s]", rule.Name).Error())
continue
}
count++
}
if err := revsuit.ldap.UpdateRules(); err != nil {
errs = append(errs, err.Error())
}
for _, rule := range rules.Ftp {
if err := db.Model(&ftp.Rule{}).Create(&rule).Error; err != nil {
errs = append(errs, errors.Wrap(err, fmt.Sprintf("ftp rule[%s]", rule.Name)).Error())
errs = append(errs, errors.Wrapf(err, "ftp rule[%s]", rule.Name).Error())
continue
}
count++
@@ -381,6 +395,42 @@ func (revsuit *Revsuit) updateRmiConfig(c *gin.Context) {
}
}
func (revsuit *Revsuit) getLdapConfig(c *gin.Context) {
c.JSON(200, revsuit.ldap.Config)
}
func (revsuit *Revsuit) updateLdapConfig(c *gin.Context) {
var form = ldap.Config{}
if err := c.ShouldBindJSON(&form); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err.Error(),
"data": nil,
})
return
}
if form.Addr != revsuit.ldap.Addr {
revsuit.ldap.Addr = form.Addr
log.Info("Update ldap config [addr] to %s", form.Addr)
}
if form.Enable != revsuit.ldap.Enable {
log.Info("Update ldap config [enable] to %v", form.Enable)
if form.Enable {
go revsuit.ldap.Run()
} else {
revsuit.ldap.Stop()
}
return
}
if revsuit.ldap.Enable {
revsuit.ldap.Restart()
}
}
func (revsuit *Revsuit) getNoticeConfig(c *gin.Context) {
c.JSON(200, revsuit.config.Notice)
}