Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-05-06 23:28:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Fix ident

Browse source
This commit is contained in:
Аlexander Kiselev 2025-02-11 11:41:17 +03:00
parent d1aa040d7c
commit 254e5a6761
3 changed files with 19 additions and 19 deletions

10
web/controller/api.go
View file

@ -21,10 +21,10 @@ func NewAPIController(g *gin.RouterGroup) *APIController {
} }
func (controller *APIController) initRouter(router *gin.RouterGroup) { func (controller *APIController) initRouter(router *gin.RouterGroup) {
apiV1 := router.Group("/panel/api") apiV1 := router.Group("/panel/api")
apiV1.Use(controller.checkLogin) apiV1.Use(controller.checkLogin)
inboundsApiGroup := apiV1.Group("/inbounds") inboundsApiGroup := apiV1.Group("/inbounds")
controller.inbounds = NewInboundController(inboundsApiGroup) controller.inbounds = NewInboundController(inboundsApiGroup)
inboundRoutes := []struct { inboundRoutes := []struct {
@ -69,8 +69,8 @@ func (controller *APIController) initApiV2Router(router *gin.RouterGroup) {
serverApiGroup := apiV2.Group("/server") serverApiGroup := apiV2.Group("/server")
inboundsApiGroup := apiV2.Group("/inbounds") inboundsApiGroup := apiV2.Group("/inbounds")
controller.inbounds = NewInboundController(inboundsApiGroup) controller.inbounds = NewInboundController(inboundsApiGroup)
controller.server = NewServerController(serverApiGroup) controller.server = NewServerController(serverApiGroup)
/** /**
* Inbounds * Inbounds

18
web/controller/base.go
View file

@ -42,14 +42,14 @@ func I18nWeb(c *gin.Context, name string, params ...string) string {
} }
func (a *BaseController) apiTokenGuard(c *gin.Context) { func (a *BaseController) apiTokenGuard(c *gin.Context) {
bearerToken := c.Request.Header.Get("Authorization") bearerToken := c.Request.Header.Get("Authorization")
tokenParts := strings.Split(bearerToken, " ") tokenParts := strings.Split(bearerToken, " ")
if len(tokenParts) != 2 { if len(tokenParts) != 2 {
pureJsonMsg(c, http.StatusUnauthorized, false, "Invalid token format") pureJsonMsg(c, http.StatusUnauthorized, false, "Invalid token format")
c.Abort() c.Abort()
return return
} }
reqToken := tokenParts[1] reqToken := tokenParts[1]
token, err := a.settingService.GetApiToken() token, err := a.settingService.GetApiToken()
if err != nil { if err != nil {
@ -59,7 +59,7 @@ func (a *BaseController) apiTokenGuard(c *gin.Context) {
} }
if reqToken != token { if reqToken != token {
pureJsonMsg(c, http.StatusUnauthorized, false, "Auth failed") pureJsonMsg(c, http.StatusUnauthorized, false, "Auth failed")
c.Abort() c.Abort()
return return
} }
@ -72,7 +72,7 @@ func (a *BaseController) apiTokenGuard(c *gin.Context) {
session.SetSessionUser(c, user) session.SetSessionUser(c, user)
c.Next() c.Next()
session.ClearSession(c) session.ClearSession(c)
} }

10
web/controller/setting.go
View file

@ -150,20 +150,20 @@ func (a *SettingController) getDefaultXrayConfig(c *gin.Context) {
} }
func (a *SettingController) getApiToken(c *gin.Context) { func (a *SettingController) getApiToken(c *gin.Context) {
response := &ApiTokenResponse{} response := &ApiTokenResponse{}
token, err := a.settingService.GetApiToken() token, err := a.settingService.GetApiToken()
if err != nil { if err != nil {
jsonObj(c, response , err) jsonObj(c, response , err)
return return
} }
response.Token = token response.Token = token
jsonObj(c, response , nil) jsonObj(c, response , nil)
} }
func (a *SettingController) generateApiToken(c *gin.Context) { func (a *SettingController) generateApiToken(c *gin.Context) {
response := &ApiTokenResponse{} response := &ApiTokenResponse{}
randomBytes := make([]byte, 32) randomBytes := make([]byte, 32)
_, err := rand.Read(randomBytes) _, err := rand.Read(randomBytes)